added custom queries to support DUI