few more script name/id fixes for caching