Implement tags/categories and fix bar selection