Previous solution broke picking from topic/hashtag/query. Change-Id: I087de693e3a8e16d62f318d59287e53ea3fc2430