Fixing weird alignment database design, see #111