Merge "Fix url for catalog query" into casablanca