Fix various issues
Finish Search form