BS-10372, fix redirection mechanism (still needs adjustments)