CONTRIB-5513 Fix visibility related errors on Overview page