use the interface
Merge pull request #505 from Squarespace/master

QueryFactory
final modifiers
remove usage of deprecated methods
class/interface usage clean up