bugfix
more redirect and default work