Refactored search query language