[KRAFDBCK-11252] Added missing inquiries for organizations and sites