Fixed routes bugs