Support for (gu)id
Fix two function in case of None element