[APA] Move additional title element logic into a separate macro