Remove complete javascript blocking
Add query string removal