diff --git a/src/services/api/.gitignore b/src/services/api/.gitignore
new file mode 100644
index 0000000000..7eff5311e3
--- /dev/null
+++ b/src/services/api/.gitignore
@@ -0,0 +1,2 @@
+# git ignore js files built by schema versions
+/layers/**/*.js
diff --git a/src/services/ui/src/components/Opensearch/Filtering/FilterableDateRange.tsx b/src/services/ui/src/components/Opensearch/Filtering/FilterableDateRange.tsx
index 8123029ab9..7d624208f6 100644
--- a/src/services/ui/src/components/Opensearch/Filtering/FilterableDateRange.tsx
+++ b/src/services/ui/src/components/Opensearch/Filtering/FilterableDateRange.tsx
@@ -164,7 +164,12 @@ export function FilterableDateRange({ value, onChange, ...props }: Props) {
             {label}
           </div>
         </PopoverTrigger>
-        <PopoverContent className="w-auto p-0" align="start">
+        <PopoverContent
+          className="w-auto p-0"
+          align="start"
+          side="left"
+          sideOffset={1}
+        >
           <Calendar
             disabled={[{ after: new Date() }]}
             initialFocus
diff --git a/src/services/ui/src/components/Opensearch/Filtering/consts.ts b/src/services/ui/src/components/Opensearch/Filtering/consts.ts
index 194c1c123e..2720f3a06d 100644
--- a/src/services/ui/src/components/Opensearch/Filtering/consts.ts
+++ b/src/services/ui/src/components/Opensearch/Filtering/consts.ts
@@ -61,7 +61,7 @@ const SPA_FILTER_GROUP = (isCms: boolean): FilterGroup => {
       value: { gte: undefined, lte: undefined },
     },
     "leadAnalystName.keyword": {
-      label: "CPOC",
+      label: "CPOC Name",
       field: "leadAnalystName.keyword",
       component: "multiSelect",
       prefix: "must",
@@ -82,7 +82,7 @@ const WAIVER_FILTER_GROUP = (isCms: boolean): FilterGroup => {
       value: [],
     },
     "planType.keyword": {
-      label: "Plan Type",
+      label: "Type",
       field: "planType.keyword",
       component: "multiCheck",
       prefix: "must",
@@ -114,7 +114,7 @@ const WAIVER_FILTER_GROUP = (isCms: boolean): FilterGroup => {
       value: { gte: undefined, lte: undefined },
     },
     raiReceivedDate: {
-      label: "RAI Response Date",
+      label: "Formal RAI Response",
       field: "raiReceivedDate",
       component: "dateRange",
       prefix: "must",
@@ -122,7 +122,7 @@ const WAIVER_FILTER_GROUP = (isCms: boolean): FilterGroup => {
       value: { gte: undefined, lte: undefined },
     },
     "leadAnalystName.keyword": {
-      label: "CPOC",
+      label: "CPOC Name",
       field: "leadAnalystName.keyword",
       component: "multiSelect",
       prefix: "must",
diff --git a/src/services/ui/src/components/Opensearch/Table/index.tsx b/src/services/ui/src/components/Opensearch/Table/index.tsx
index a71f2b0586..773147ea14 100644
--- a/src/services/ui/src/components/Opensearch/Table/index.tsx
+++ b/src/services/ui/src/components/Opensearch/Table/index.tsx
@@ -81,7 +81,7 @@ export const OsTable: FC<{
           <UI.TableRow className="h-10">
             <UI.TableCell className="flex">
               <p className="font-medium whitespace-nowrap h-[20px]"> </p>
-              <p className="absolute right-[50%] top-[50%] translate-x-[50%] translate-y-[50%] font-medium text-lg text-gray-500">
+              <p className="absolute right-[50%] translate-x-[50%] translate-y-[50%] font-medium text-lg text-gray-500">
                 No Results Found
               </p>
             </UI.TableCell>