Minor cleanum and fixed persistant removal of search forms.