move remaining queries into db module