[COOK-3578] Fix support for package_id with spaces