diff --git a/src/app/content/bloks/prompt-input-questions.tsx b/src/app/content/bloks/prompt-input-questions.tsx
index 54c69dab..169eef4d 100644
--- a/src/app/content/bloks/prompt-input-questions.tsx
+++ b/src/app/content/bloks/prompt-input-questions.tsx
@@ -534,7 +534,7 @@ function QuestionPromptCard({
 
           <p className="text-sm text-foreground">{question}</p>
 
-          <ul
+          <div
             role="radiogroup"
             aria-label="Question answers"
             className="flex flex-col gap-2"
@@ -543,7 +543,7 @@ function QuestionPromptCard({
               const letter = String.fromCharCode(65 + index);
               const isSelected = selectedId === answer.id;
               return (
-                <li key={answer.id} className="min-w-0">
+                <div key={answer.id} className="min-w-0">
                   <button
                     type="button"
                     role="radio"
@@ -560,10 +560,10 @@ function QuestionPromptCard({
                     <span className="shrink-0">{letter}.</span>
                     <span className="min-w-0 truncate">{answer.label}</span>
                   </button>
-                </li>
+                </div>
               );
             })}
-          </ul>
+          </div>
         </div>
       )}
 
diff --git a/src/components/code-block.tsx b/src/components/code-block.tsx
index f04aaedd..9eecd792 100644
--- a/src/components/code-block.tsx
+++ b/src/components/code-block.tsx
@@ -123,8 +123,12 @@ export function CodeBlock({
   return (
     <div
       dir="ltr"
+      role="region"
+      tabIndex={0}
+      aria-label="Code sample"
       className={cn(
         "relative rounded-md bg-muted max-h-[400px] overflow-auto",
+        "outline-none focus-visible:ring-2 focus-visible:ring-ring/50",
         className,
       )}
       style={{ width: "100%", maxWidth: "100%" }}
diff --git a/src/components/ui/date-picker.tsx b/src/components/ui/date-picker.tsx
index d5efe790..c386a902 100644
--- a/src/components/ui/date-picker.tsx
+++ b/src/components/ui/date-picker.tsx
@@ -30,7 +30,10 @@ type CalendarProps = React.ComponentProps<typeof Calendar>;
  * For DayPicker label creators (nav, days, etc.), use `calendarProps.ariaLabels`.
  */
 export type DatePickerAriaLabels = {
-  /** `aria-label` on the popover trigger button */
+  /**
+   * `aria-label` on the popover trigger when **no date is selected** (empty state).
+   * When a date is shown, `aria-label` is omitted so the visible formatted date is the accessible name.
+   */
   popoverTrigger?: string;
 };
 
@@ -154,8 +157,10 @@ function DatePickerSimple(props: DatePickerSimpleProps) {
           colorScheme="neutral"
           disabled={disabled}
           aria-label={
-            ariaLabels?.popoverTrigger ??
-            (typeof placeholder === "string" ? placeholder : undefined)
+            date
+              ? undefined
+              : (ariaLabels?.popoverTrigger ??
+                (typeof placeholder === "string" ? placeholder : undefined))
           }
           className={cn(
             "border-input border-1 data-[state=open]:border-2 data-[state=open]:border-primary rounded-md text-md data-[placeholder]:text-muted-foreground [&_svg:not([class*='text-'])]:text-muted-foreground focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 dark:hover:bg-input/50 flex w-fit items-center justify-between gap-2 bg-body-bg px-3 py-2 whitespace-nowrap shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[2px] disabled:cursor-not-allowed disabled:opacity-50 h-10",
@@ -279,8 +284,10 @@ function DatePickerWithRange(props: DatePickerWithRangeProps) {
           colorScheme="neutral"
           disabled={disabled}
           aria-label={
-            ariaLabels?.popoverTrigger ??
-            (typeof placeholder === "string" ? placeholder : undefined)
+            range?.from
+              ? undefined
+              : (ariaLabels?.popoverTrigger ??
+                (typeof placeholder === "string" ? placeholder : undefined))
           }
           className={cn(
             "border-input border-1 data-[state=open]:border-2 data-[state=open]:border-primary rounded-md text-md data-[placeholder]:text-muted-foreground [&_svg:not([class*='text-'])]:text-muted-foreground focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 dark:hover:bg-input/50 flex w-fit items-center justify-between gap-2 bg-body-bg px-3 py-2 whitespace-nowrap shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[2px] disabled:cursor-not-allowed disabled:opacity-50 h-10",
diff --git a/src/components/ui/filter.tsx b/src/components/ui/filter.tsx
index 24b4916f..c5016bab 100644
--- a/src/components/ui/filter.tsx
+++ b/src/components/ui/filter.tsx
@@ -159,7 +159,7 @@ export interface FilterMultiSelectProps {
   disabled?: boolean;
   name?: string;
   helperText?: string;
-  "aria-describedby"?: string;
+  "aria-label"?: string;
   renderOption?: (option: FilterOption) => React.ReactNode;
   open?: boolean;
   onOpenChange?: (open: boolean) => void;