修正conditionSearch無法執行的問題
Merge branch 'master' into michael
change catagory