moved queryFactorType into FilterParameters and make more use of FilterParameters