Updates for AFAS and SAP, faster joining when using a prefix/suffix