[Separate Query From Modifier] refactoring the last part.
[Separate Query From Modifier] refactoring the last part.

hellocreep/refactoring,hellocreep/refactoring,hellocreep/refactoring,hellocreep/refactoring,hellocreep/refactoring,hellocreep/refactoring