FIX: Query for activating controls should not match all controls