fixed issues caused by DB table structure changes