Modify query
add new test examples
fix