Indeed, didn't want to break the routes loop. But I didn't feel comfortable neither about how this code complexity. I look dumb now in front of the obvious. Fixing :)