BFS tweaks and restore hidden options