MAP-320:  Further revisions for pfsParameter.  Renamed explicit query routines findXXXForQuery.