Yes @akanter I am aware of the overlap, and it is because of the way we used them in our custom html forms. We didn't want to alter the CIEL concepts markedly, because we feared they might be used by other forms. For example, the CIEL version of hypertension has class: Diagnosis and data type: N/A, while ours has class: Misc and data type: Boolean . I will review our custom concepts again in the light of what you have said i.e. use CIEL concepts where necessary (and possible), and also indicate new concepts like you new pointed.
At the moment we have to meet deadline, and we need a quick fix to the problem. I will very much need as much help as possible to solve this problem, and in the nearest future begin to implement the things you have pointed. Thanks again