Added some additional quotes to db and cleaned up some duplicate ones