CW-334 Various fixes legislation view