Handle trailing slashes properly
Add an option to disable name-only matches