Fixed the outstanding issues with variable and repeatable parameters