Reverted to the old wildcard matching algorithm
Work in progress