re 2599 : typo in argument order           shift the method name from the args           fixed filter names
re 2599 : typo in argument order
          shift the method name from the args
          fixed filter names

david-martin/fh-fhc,grdryn/fh-fhc,shannonmpoole/fh-fhc,wei-lee/fh-fhc,paolobueno/fh-fhc,nialldonnellyfh/fh-fhc