Fixed filename escaping