added search and tagging