Adding and activating locations works now