renamed router, added search functionality