Fixed front end to not totally break with new data model.