made the database layer use the reposed query builder which uses better count stuff