Modified sorting to put all non-temporal and spatial filters in alphabetic order
Improved testing