refactor
tagging and search functionality added