add categorized tags and introduce search