Fixed issue with cover and unions of hierarchy types
Boostrap: started obeying type restrictions