Bastion: replacing haml org switcher with html org switcher.

Also adding fliter capability to resolve BZ #980160.