Cloud fetch for single file issues fixed-3