server Resource search fix
fix confl
boh