Fixes to InputTag options