use sort fields in preference to actual fields - issue #161
Merge branch 'master' into artistorder