Sorting facet options and handling urls in search
Resolved conflicts