Fixing problem with lookup generating search