Changed splitQuery