More DB Conversion

Fixed more queries, think just the import queries need fixed now.