GEOS-5630 fixing custom dimensions management

See GEOS-5630