improve matching using lower and strip