Repaire JS broken in group and directive screens