fix bug on query condtion with me
add more test
add test