added feature sort functions to query
Merge remote-tracking branch 'origin/master' into feature_s3_query_from_admin