Bugfix Focus & UnitSelect Focus