escape system name and simplify .jsp a bit
escape system name and simplify .jsp