Fix orderby
handle user meta also
Merge remote-tracking branch 'upstream/fix-orderby'

* upstream/fix-orderby:
  handle user meta also
  Fix orderby