Improved cmd administration of enquiries