possible fix to the data source/display mismatch zidb problem. plz test