optimized class CESearch
Merge branch 'tmp' into 2.0