updates to handle empty org value