Better regex for Features menu link handling #2139