Cleanup searchform.
Merge branch 'develop'