added custom simple search block
fix merge conflict