Finish search and filter in Catalog.html