Convert filter links into standard form buttons

Fixes #17834