Added missing search, custom search

Also removed bad search controls.