Add missing categories and some tags