refactoring RequestPreferences
fixed failing tests and some more refactoring around queryFactorType
moved queryFactorType into FilterParameters and make more use of FilterParameters
refactoring organismParts parameter to queryFactorValues
towards merging back onto master