Fix the zones management feature