improve matching to remove numbers from tailed expression
improve matching to remove numbers from tailed expression

tucano/bpipe,vivovip/bpipe,tucano/bpipe,tucano/bpipe,vivovip/bpipe,sb43/bpipe,vivovip/bpipe,sb43/bpipe,sb43/bpipe