improve filename matching for mask

we should not rely that mask filename will be of the same extension
as the image filename so better pattern matching is added