More code adjustments. Throws an unhappy error for queries. Will test in DevCenter.