Sortable custom field options and bug fix for unrelated custom fields on listing page