change database_id to string per marks request