Martin/20 mar fixes to bhsi model and views