Fixing the ParamEntityFinder.