Fixes hashtag matching
Improving hashtag search and avoid variables conclicts