Fix unit status selector