Improving the ParamEntityFinder a bit.