BugFix on IdentifyQuery