#10596 adjustments & adding browser selector