Merge "Fix: 'query disabled' error"