fix tags and search issues