Changed search to add_tag and added new search controller
merge stuff