Options update and redirect fix