Fixed DisplayLocations/Categories handling