Improve highlighting + file match