Improve tag search query (#27)
Improve companies search query (#27)