Refactor of the router. Added a lookup and a search controller