Remove id from notificationQ and replace queries using recordId
Abstract accountRecordId and tenantRecordId