Internal query handling completely rewritten.