[#WIZ-247] Browser | minor fixes after refactoring