Entity search fix