Do refactoring of genome element type hierarchy
Change KEYWORD regexp