Fixing locations / categories crasy in api