preserve query when sorting
Merge branch 'working'