Fixing entities and PrescriptionID conflict issues