Additional filtering for sort fields.
Merge pull request #68 from adam-vessey/non-sort-sorting

Additional filtering for sort fields.