Improve no-js handling