Merge pull request #1605 from marcel-blonk/PLFM-3071

add sort fields to query object