fix some improvements for data_model items