More redirect fixes per Google Analytics