BZ-12550 fixing messages and href