Add matching by base-name only (fused off by only by path) (#1238)

Add matching by base-name only (fused off by only by path) (#1238) #94