join/unjoin fixes, plus better amf_controller error handling for deleted items