Crear/refactor search

This depends on #63 

<!---
@huboard:{"order":11.75}
-->