Changed indexOf call to regex for noTax matching