Splitting O4 into O4a/O4b, adding ER16

O4 is split into two segments, with ER16 defined separately.

Note that this breaks backwards compatibility, as searches for O4 will no longer work. This needs to be fixed before releasing. fixed