Resolved query issue(V1.7.3)