do not use top handler in browser
some fixes