Fixes for libraryScan

Better matching of filename