Added logic to find file or file + extension without glob