Deal with spaces in name of parent objects.
Improve support to objects with uncommon names.