Added additional exceptions to guest access for controller and self access (when unit is own guest)