Added functionality to disable options when changing instrument on filtering and Fix for Field Operator filtering