Removed instrument filter hardcoding refs #2320