awesome query set refactoring. not finished.