diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests
index e568b8e8f1..b25a41a6b9 100644
--- a/development/autotests/invertedTests
+++ b/development/autotests/invertedTests
@@ -458,6 +458,8 @@ export/examples/.*/American_Mathematical_Society_%28AMS%29_docbook5
 #   - ACS: comments in the middle of the author info can wreak havoc (fixable).
       Some bibliography entries do not exist within the document. Floats are empty.
 export/examples/Articles/American_Chemical_Society_%28ACS%29_docbook5
+#   - A&A: formula with two references (only one xml:id allowed per <equation> tag).
+export/examples/Articles/Astronomy_%26_Astrophysics_docbook5
 # - Branches may cause problems (especially when mixing with parts that must go in <info>).
 export/export/latex/languages/supported-languages_(|babel|babel_auto-legacy)_?docbook5
 # - EmbeddedObjects: this document is too complex, with captions within tables, many LaTeX parameters when including
diff --git a/lib/layouts/aa.layout b/lib/layouts/aa.layout
index 9bf68c0ad6..af274bdda8 100644
--- a/lib/layouts/aa.layout
+++ b/lib/layouts/aa.layout
@@ -43,6 +43,7 @@ Style Standard
 	Align		Block
 	AlignPossible	Block, Left, Right, Center
 	LabelType	No_Label
+	DocBookTag  para
 End
 
 Input stdinsets.inc
@@ -84,6 +85,8 @@ Style Subtitle
 	  Size		Larger
 	  Series	Bold
 	EndFont
+	DocBookTag            subtitle
+	DocBookInInfo         maybe
 End
 
 
@@ -102,6 +105,8 @@ Style Address
 	  Family	Roman
 	  Size		Small
 	EndFont
+	DocBookTag      address
+	DocBookInInfo   always
 End
 
 
@@ -125,6 +130,12 @@ Style Offprint
 	  Size		Small
 	  Shape		Slanted
 	EndFont
+	DocBookTag            personname
+	DocBookTagType        paragraph
+	DocBookWrapperTag     author
+	DocBookWrapperAttr    role='offprint'
+	DocBookWrapperTagType inline
+	DocBookInInfo         always
 End
 
 
@@ -148,6 +159,10 @@ Style Mail
 	  Size		Small
 	  Shape		Slanted
 	EndFont
+	DocBookTag      author
+	DocBookAttr     role='mail'
+	DocBookTagType  paragraph
+	DocBookInInfo   always
 End
 
 
@@ -233,6 +248,9 @@ Style Date
 	Font
 	  Size		Small
 	EndFont
+	DocBookTag      date
+	DocBookTagType  paragraph
+	DocBookInInfo   always
 End
 
 
@@ -285,6 +303,11 @@ Style Abstract_(unstructured)
 	  Series	Bold
 	  Size		Small
 	EndFont
+	DocBookTag         para
+	DocBookWrapperTag  abstract
+	DocBookWrapperAttr role='unstructured'
+	DocBookWrapperMergeWithPrevious  true
+	DocBookInInfo     always
 End
 
 
@@ -315,6 +338,11 @@ Style Abstract_(structured)
 	  LabelString	"Results"
 	  Tooltip	"Results of your work"
 	EndArgument
+	DocBookTag         para
+	DocBookWrapperTag  abstract
+	DocBookWrapperAttr role='structured'
+	DocBookWrapperMergeWithPrevious  true
+	DocBookInInfo     always
 End
 
 
@@ -345,6 +373,9 @@ Style Keywords
 	  Series	Bold
 	  Size		Small
 	EndFont
+	DocBookTag         keyword
+	DocBookTagType     paragraph
+	DocBookWrapperTag  keywordset
 End
 
 
diff --git a/lib/layouts/scrclass.inc b/lib/layouts/scrclass.inc
index a6775b41d3..8c5c5b1b2a 100644
--- a/lib/layouts/scrclass.inc
+++ b/lib/layouts/scrclass.inc
@@ -205,6 +205,7 @@ Style Title
 	  Series              Bold
 	EndFont
 	DocBookTag            title
+	DocBookInInfo         maybe
 End
 
 Style Subtitle
@@ -214,6 +215,7 @@ Style Subtitle
 	  Size                Large
 	EndFont
 	DocBookTag            subtitle
+	DocBookInInfo         maybe
 End