merge search 4.4 fixes