Refactor QueryScopes on Event Model