Fixed #3 and added tags and categories for taxonimies