added guard
added a search page and improved the search options