try to work around bugs in org lookup logic