Improve funding search form display

Conceptually better but still named poorly
Fixes #2802