simplify and detect better non frame wrapped mappings