Various updates to AFAS, SAP and tags