move redirect resolving to separate script