Add field collation in -query functions