Fixed tags and added categories