fixed filesystem loader when the name needs to be normalized
reverted optimizations done in the filesystem loader as it beaks BC