Max on list containing None fails.

Fixes issue #546
This is a re-fix of a missing fix.
Also includes a second fix of a missing fix, in our contact form.
:-/
Tested myself, asked @gimick to fix.  Will merge directly if fix works, as this fix has been tested and retested over time.