[web] [fix] [ENG-1024] Additional Changes for ENG-766 that were missed before landing.

Summary: follow up from https://phabricator.ashoat.com/D3539 comments that were not landed

Test Plan: make sure all diff review has been addressed correctly.

Reviewers: atul, palys-swm, def-au1t, yayabosh, ashoat

Reviewed By: ashoat

Subscribers: ashoat, palys-swm, Adrian, karol-bisztyga, yayabosh

Differential Revision: https://phabricator.ashoat.com/D3782