Added more support for NoScript