Add circuit_id filter with validations