Added tag listing
Completed tagging