[aquamar] enhanced product validation checks