Include geometry on sub indicators

Just hacks it so that geometries get included in sub indicators