us40 - Implemented adding and removing tags from search and added free
text search