More CMS Query Fixes - Misc errors