JAL-1499 improved parsing of !Domain and !Gene including