little refactor
Rename routes
Simple search. Some fixes