Hopefully last change for Location-category changes