[@vietmyke] made the couple changes you recommended, take another look at it please to see that it works.