Trying to fix search and remove in fine grain