hbtraining: fixed for new DB