Moved home page events query builder to service