Updated search query parsing