v0.0.16 - Always do an extra query after a filename check to account for langs which don't have filename matches