Small fixups and search in flows option.