#4769: Filter menu entry, #4787: fix complex links

- Also minor code improves.