order_from_names, order_from_urls fix