Minor changes made to add tag feature