Unlimited Attempts Quiz | Results Slide, Review Quiz Error

Hi, I have developed a 10-questioned knowledge assessment in Storyline 3, with a results slide that reports the score to the LMS. The passing score is 80%. Each quiz question is  set for Unlimited attempts, which we needed to add custom triggers to all of the Feedback layers in order for the Results slide to work properly so the users can re-take their questions. The trigger said "If scorePercent is less than PassPercent, jump to the next slide upon timeline start. If the questions are not set to "Unlimited", we are unable to answer the question more than once when revisiting, so we added these triggers to make the quiz jump to the next slide after answering, which worked perfectly.

The issue we are having, is that when reviewing the quiz using the "Review Quiz" button from the results slide, because of the triggers I had to add to workaround the unlimited attempts, the slide layers are displaying upon reviewing the quiz, but my code seems to be still be called, and it is not getting the conditional statements I had to write. 

Is there a way to have an assessment with unlimited attempts, as well as allowing to "Review Quiz" from the Results slide? I am not finding any way to do this. Any help would be greatly appreciated.