better context browser (see #1424)