more accurate redirect on all pages