improve categories and tags