make maps work for non-default features