added filtering based on control mode