improve query for hashtags and @
Merge pull request #2 from jdungan/master

improve query for hashtags and @