Cleanup
New base search control