Minor Changes to Wildcard Comparer to improve matching