improve query for hashtags and @