new API, fix non-geometry layers