added tagging and search