I think this is a little more sane?
Add additional options to search form and extract capture helper