Additional redirect fixes

Saves redirect target into the correct directory

Change-Id: I44733da107c9a5a382bf129860bde7c6d4bdf0aa