Fix lab name is not displayed
Separate hs and univ in invoice page