SearchWindowProxy fix
Merge branch 'SearchWindowProxy-Fix'