fix search keyboard doesnt disappear
merging