Fixed a few potential issues, changed support-search form