Added additional templates.  Modified map to filter on 'osfinger'.