Fixed query ids#2406

hackmod wants to merge 2 commits intoxpressengine:developxpressengine/xe-core:developfrom

hackmod:fixed-queryidhackmod/xe-core:fixed-queryidCopy head branch name to clipboard