Search form ordering fixed. Misc changes.