Made mapper more consistent with owls_cache.