Added support for substring match and removed numbers of set from the title