bring policy config setting in line with entity config, now support JSON; and fix tests
sort locations by display name, ignoring case (and sorting numbers as numbers); and tidy how catalog items are displayed