i dont remember what id did
have no idea what I've changed
fixed findWithMapper according to new identity map