added autofilling of ORG_ID, added alcohol checkbox