Added missing tenant-filtering logic/SQL; Added improved error reporting to clients;