- fixed subdir detection when uploading into subdir
- add class detection before overriding to avoid JS errors