Add more tag related searches with tests