Added more searching functionality and viewing more results