Fix tags and category