router fix + brunched