Play around with query builder
Change for date model change