Merge "RCFilters: Retain extra url params when comparing url equivalency"