diff --git a/client/src/app/+my-library/my-video-channel-syncs/video-channel-sync-edit/video-channel-sync-edit.component.html b/client/src/app/+my-library/my-video-channel-syncs/video-channel-sync-edit/video-channel-sync-edit.component.html
index 2ffad3d39..099d37fe2 100644
--- a/client/src/app/+my-library/my-video-channel-syncs/video-channel-sync-edit/video-channel-sync-edit.component.html
+++ b/client/src/app/+my-library/my-video-channel-syncs/video-channel-sync-edit/video-channel-sync-edit.component.html
@@ -38,7 +38,7 @@
           </div>
         </div>
 
-        <div class="form-group">
+        <div class="form-group" role="radiogroup">
           <label for="existingVideoStrategy" i18n>Options for existing videos on remote channel:</label>
 
           <div class="peertube-radio-container">
diff --git a/client/src/app/+search/search-filters.component.html b/client/src/app/+search/search-filters.component.html
index 5b9237379..69ef32851 100644
--- a/client/src/app/+search/search-filters.component.html
+++ b/client/src/app/+search/search-filters.component.html
@@ -2,7 +2,7 @@
 
   <div class="row">
     <div class="col-lg-4 col-md-6 col-xs-12">
-      <div class="form-group">
+      <fieldset class="form-group" role="radiogroup">
         <div class="radio-label label-container">
           <label for="sort" i18n>Sort</label>
           <button i18n class="reset-button reset-button-small" (click)="resetField('sort', '-match')" *ngIf="advancedSearch.sort !== '-match'">
@@ -14,9 +14,9 @@
           <input type="radio" name="sort" [id]="sort.id" [value]="sort.id" [(ngModel)]="advancedSearch.sort">
           <label [for]="sort.id" class="radio">{{ sort.label }}</label>
         </div>
-      </div>
+      </fieldset>
 
-      <div class="form-group">
+      <div class="form-group" role="radiogroup">
         <div class="radio-label label-container">
           <label for="isLive" i18n>Display only</label>
           <button i18n class="reset-button reset-button-small" (click)="resetField('isLive')" *ngIf="advancedSearch.isLive !== undefined">
@@ -35,7 +35,7 @@
         </div>
       </div>
 
-      <div class="form-group">
+      <div class="form-group" role="radiogroup">
         <div class="radio-label label-container">
           <label for="sensitiveContent" i18n>Display sensitive content</label>
           <button i18n class="reset-button reset-button-small" (click)="resetField('nsfw')" *ngIf="advancedSearch.nsfw !== undefined">
@@ -103,7 +103,7 @@
     </div>
 
     <div class="col-lg-4 col-md-6 col-xs-12">
-      <div class="form-group">
+      <div class="form-group" role="radiogroup">
         <div class="radio-label label-container">
           <label for="durationRange" i18n>Duration</label>
           <button i18n class="reset-button reset-button-small" (click)="resetLocalField('durationRange')" *ngIf="durationRange !== undefined">
@@ -182,7 +182,7 @@
         >
       </div>
 
-      <div class="form-group">
+      <div class="form-group" role="radiogroup">
         <div class="radio-label label-container">
           <label for="resultType" i18n>Result types</label>
           <button i18n class="reset-button reset-button-small" (click)="resetField('resultType')" *ngIf="advancedSearch.resultType !== undefined">
@@ -207,7 +207,7 @@
 
       </div>
 
-      <div class="form-group" *ngIf="isSearchTargetEnabled()">
+      <div class="form-group" *ngIf="isSearchTargetEnabled()" role="radiogroup">
         <div class="radio-label label-container">
           <label for="searchTarget" i18n>Search target</label>
         </div>
diff --git a/client/src/app/shared/shared-video-miniature/video-filters-header.component.html b/client/src/app/shared/shared-video-miniature/video-filters-header.component.html
index 3fbfaed28..a91aa26c0 100644
--- a/client/src/app/shared/shared-video-miniature/video-filters-header.component.html
+++ b/client/src/app/shared/shared-video-miniature/video-filters-header.component.html
@@ -65,7 +65,7 @@
         <my-select-languages [maxLanguages]="20" formControlName="languageOneOf"></my-select-languages>
       </div>
 
-      <div class="form-group">
+      <div class="form-group" role="radiogroup">
         <label class="with-description" for="nsfw" i18n>Sensitive content:</label>
         <ng-template *ngTemplateOutlet="updateSettings; context: { $implicit: 'video-sensitive-content-policy' }"></ng-template>
 
@@ -80,7 +80,7 @@
         </div>
       </div>
 
-      <div class="form-group" *ngIf="!hideScope">
+      <div class="form-group" *ngIf="!hideScope" role="radiogroup">
         <label for="scope" i18n>Scope:</label>
 
         <div class="peertube-radio-container">
@@ -94,7 +94,7 @@
         </div>
       </div>
 
-      <div class="form-group">
+      <div class="form-group" role="radiogroup">
         <label for="type" i18n>Type:</label>
 
         <div class="peertube-radio-container">