Working on trading mode filter