fix up pf3 and pf2 args
some improvements to an advanced search spec