Fix support for parent names with spaces