small updated: avoid generation of invalid paths as well as adding support for magic keyword "universal" for product parameter