Remove RelativeUrl. Add query and fragment support