Mvp fixes

maybe rename from assignment_id to assigned_entity_id