Added the random card fix to all routes