improved file name resolving in watch service