Crear/refactor search

This depends on #63