Hot fix sort on Base URL