Template match should be based on basename

[mklabs]

Expand file.ext works correctly, dir/file.ext doesn't. Should base the template match on just file.ext