Adding support for jstl + js fixes