Reworked locations permission workflow slightly