fix datamodel and conditional on display