Card #92 simplified location address (for now), added all fields for save/update