Fix a bug. Now Query truly work.