extended query to support sort as objects, array, strings...
Merge remote-tracking branch 'origin/dev' into dev