#799 - Added redirect Id resolution
#799 - Included missing if statement on old Ids