re-enabling search
build
merge with latest