make institution query more null-safe