getDriverById(int id) -> getDriverByCriteria(Criteria criteria); getTruckById(int id) -> getTruckByCriteria(Criteria criteria); Bugfix: not working query in the getDriverByCriteria(). Bugfix: storing the new driver's truck when in editing mode.