Fixed bug with 'name', since removed from DB table