Improvements to figuring out which file is being tracked and providing accurate information