This is a regression after CAY-2416 . Queries should be sorted by name as everything else in DataMap xml file.