Use a different method to get context
Sorting of context queries works after a fashion
Fix breakage with no results in the new context method
Better way of sorting context
Merge branch 'feature_context-rework'

Conflicts:
	query.py