metadata fetching flow improvements

Please review @schilit