Merge "Changing resource identifier to a query param"