Add a query invariant
Remove NormalizeSort Listener (moved to VF2)