Improved search forms

Some of these variables will need updating