Fixed rate-group to work with the new database