Fixed routing issue. This is a temp fix that will be refactored ... tomorrow