Added sectags back to search, various cleanups and fixes for search display