WL-3156 Locations and Categories live in harmony