[yanqian & fangzhigang] Uniform the query conditions