Resolved nav and categories redirect issues