diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c0bd3b9b..cca8a51a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,7 +64,8 @@ Inventory causes an error. Refs UIIN-2012.
 * Applied filters don't reset when user select "Browse contributors" search option. Refs UIIN-2068.
 * Create Jest/RTL test for PrimaryToggleButton. Refs UIIN-1666.
 * Adjust query parameters on the subject browse form. Refs UIIN-2075.
-* * Improve query when search by call number. Refs UIIN-2078.
+* Improve query when search by call number. Refs UIIN-2078.
+* Rename and reorder search options for clarity, consistency. Fixes UIIN-2060, UIIN-2061.
 * Browse contributors. Placeholder match does not look right in the contributor column. Refs UIIN-2079
 
 ## [9.0.0](https://github.com/folio-org/ui-inventory/tree/v9.0.0) (2022-03-03)
diff --git a/src/filterConfig.js b/src/filterConfig.js
index 9db1d5bee..b93b695d6 100644
--- a/src/filterConfig.js
+++ b/src/filterConfig.js
@@ -117,11 +117,11 @@ export const instanceIndexes = [
   { label: 'ui-inventory.issn', value: 'issn', queryTemplate: 'issn="%{query.query}"' },
   { label: 'ui-inventory.search.oclc', value: 'oclc', queryTemplate: 'oclc="%{query.query}"' },
   { label: 'ui-inventory.subject', value: 'subject', queryTemplate: 'subjects="%{query.query}"' },
+  { label: 'ui-inventory.effectiveCallNumberShelving', value: 'callNumber', queryTemplate: 'callNumber=%{query.query}' },
   { label: 'ui-inventory.instanceHrid', value: 'hrid', queryTemplate: 'hrid=="%{query.query}"' },
   { label: 'ui-inventory.instanceId', value: 'id', queryTemplate: 'id="%{query.query}"' },
   { label: 'ui-inventory.search.allFields', value: 'allFields', queryTemplate: 'cql.all all "%{query.query}"' },
   { label: 'ui-inventory.querySearch', value: 'querySearch', queryTemplate: '%{query.query}' },
-  { label: 'ui-inventory.callNumber', value: 'callNumber', queryTemplate: 'callNumber=%{query.query}' },
   { label: '-------------------------------------------', value: 'noValue', disabled: true },
   { label: 'ui-inventory.browseCallNumbers', value: `${browseModeOptions.CALL_NUMBERS}`, queryTemplate: '%{query.query}' },
   { label: 'ui-inventory.browseContributors', value: `${browseModeOptions.CONTRIBUTORS}`, queryTemplate: '%{query.query}' },
@@ -152,8 +152,8 @@ export const holdingIndexes = [
     value: 'callNumberNormalized',
     queryTemplate: 'holdingsNormalizedCallNumbers="%{query.query}"' },
   { label: 'ui-inventory.holdingsHrid', value: 'hrid', queryTemplate: 'holdings.hrid=="%{query.query}"' },
-  { label: 'ui-inventory.search.allFields', value: 'allFields', queryTemplate: 'cql.all all "%{query.query}"' },
   { label: 'ui-inventory.search.holdings.uuid', value: 'hid', queryTemplate: 'holdings.id=="%{query.query}"' },
+  { label: 'ui-inventory.search.allFields', value: 'allFields', queryTemplate: 'cql.all all "%{query.query}"' },
   { label: 'ui-inventory.querySearch', value: 'querySearch', queryTemplate: '%{query.query}' },
 ];
 
@@ -222,8 +222,8 @@ export const itemIndexes = [
     value: 'itemNormalizedCallNumbers',
     queryTemplate: 'itemNormalizedCallNumbers="%{query.query}"' },
   { label: 'ui-inventory.itemHrid', value: 'hrid', queryTemplate: 'items.hrid=="%{query.query}"' },
-  { label: 'ui-inventory.search.allFields', value: 'allFields', queryTemplate: 'cql.all all "%{query.query}"' },
   { label: 'ui-inventory.search.item.uuid', value: 'iid', queryTemplate: 'item.id=="%{query.query}"' },
+  { label: 'ui-inventory.search.allFields', value: 'allFields', queryTemplate: 'cql.all all "%{query.query}"' },
   { label: 'ui-inventory.querySearch', value: 'querySearch', queryTemplate: '%{query.query}' },
 
 ];
diff --git a/translations/ui-inventory/en.json b/translations/ui-inventory/en.json
index aba8eb606..fb7c88e48 100644
--- a/translations/ui-inventory/en.json
+++ b/translations/ui-inventory/en.json
@@ -141,6 +141,7 @@
   "effectiveLocation": "Effective location for item",
   "effectiveLocationShort": "Effective location",
   "effectiveCallNumber": "Effective call number string",
+  "effectiveCallNumberShelving": "Effective call number (item), shelving order",
   "permanent": "Permanent",
   "temporary": "Temporary",
   "selectPermanenLocation": "Select permanent location",
diff --git a/translations/ui-inventory/en_US.json b/translations/ui-inventory/en_US.json
index b1f718e85..ba8931a2f 100644
--- a/translations/ui-inventory/en_US.json
+++ b/translations/ui-inventory/en_US.json
@@ -437,6 +437,7 @@
     "reports.inTransitItem.volume": "Volume",
     "reports.inTransitItem.yearCaption": "Year",
     "effectiveCallNumber": "Effective call number string",
+    "effectiveCallNumberShelving": "Effective call number (item), shelving order",
     "updatedDateAndTime": "Updated date and time",
     "updatedSource": "Updated source",
     "createdDateAndTime": "Created date and time",