Fixed IMapper search, to be tested