ace integration 2
merge
merge
merge
fix broken search problem