[BUG #8718] Add support for single files. Search with and without slash to catch files and directories