fixing guid-key and entity-name fns for nil input