55066242 For for redirection loop

Fixes redirection loop mentioned in story comments. We rely on
using local search variable and therefore we got into infinite
redirection loop.