#6375: Fix redirect and add selected structure to session