Adding support for search by filename