- A ver tiny fix
- Some minor refactorings to add the search strategies to the query