Fix ChangeType recipe's path resolution logic for substring and directory matches

Fix ChangeType recipe's path resolution logic for substring and directory matches #20911