Align cms_maps with maps