Fix up for unicode querys