Dir will be added by script handler
More thumb fixes