Synced with production chosen setting
Removed instrument filter hardcoding refs #2320
Merge pull request #23 from dragos-dumi/master

Synced with production chosen setting