Remove Subject tags from Collection criteria and sort
This refs affinitic #5899