Fix for unicode queries