Handle routing properly