Fixing fetchEntityByKey overload