refactored search
rename query