MODE-1820-b: Web explorer fixed PR

Fixed and cherry picked request for web explorer