Switching pontos to feature/search-within-results