diff --git a/bridge/src/select25.tsx b/bridge/src/select25.tsx
index 39aefc20..5470da67 100644
--- a/bridge/src/select25.tsx
+++ b/bridge/src/select25.tsx
@@ -7,7 +7,7 @@ import '../../control/src/select25.scss';
 import { SingleSelect } from '../../control/src/single-select';
 import { extend } from '../../control/src/util';
 import { Ajax, createQueryFromAjax } from './ajax';
-import { DataFunction, createQueryFromData } from './data';
+import { createQueryFromData, DataFunction } from './data';
 import { Store } from './store';
 
 const forceImportOfH = h;
@@ -224,21 +224,21 @@ function create<T>(element: HTMLInputElement, options: Options) {
         options.tabIndex = element.tabIndex;
     }
 
-    if (element.getAttribute('s25-style')) {
+    if (element.getAttribute('data-s25-container-style')) {
         let style = options.containerStyle || '';
         if (style.length > 0) {
             style += ';';
         }
-        style += element.getAttribute('s25-style');
+        style += element.getAttribute('data-s25-container-style');
         options.containerStyle = style;
     }
 
-    if (element.getAttribute('s25-class')) {
+    if (element.getAttribute('data-s25-container-class')) {
         let clazz = options.containerClass || '';
         if (clazz.length > 0) {
             clazz += ' ';
         }
-        clazz += element.getAttribute('s25-class');
+        clazz += element.getAttribute('data-s25-container-class');
         options.containerClass = clazz;
     }
 
diff --git a/control/src/multi-select.tsx b/control/src/multi-select.tsx
index 46279fb5..b4998051 100644
--- a/control/src/multi-select.tsx
+++ b/control/src/multi-select.tsx
@@ -166,7 +166,7 @@ export class MultiSelect extends AbstractSelect<Props, State> {
                             );
                         })}
                         <label htmlFor={undefined} className={style.offscreen}>
-                            {props.comboboxLabel}
+                            {comboboxLabel}
                         </label>
                         <input
                             type='text'
diff --git a/control/src/result-list.tsx b/control/src/result-list.tsx
index 1e2d0af5..58369dda 100644
--- a/control/src/result-list.tsx
+++ b/control/src/result-list.tsx
@@ -59,7 +59,6 @@ export class ResultList extends Component<Props> {
                     onScroll={this.onScroll}
                     class={style.searchResults}
                     aria-busy={props.loading}
-                    style={{ maxHeight: '175px' }}
                 >
                     {props.loading && (
                         <div class={cn(style.searchResultsLoading, style.searchResultsMessage)}>
diff --git a/control/src/select25.scss b/control/src/select25.scss
index a27dd769..793d5d90 100644
--- a/control/src/select25.scss
+++ b/control/src/select25.scss
@@ -218,6 +218,7 @@ $dropdown-padding: 8px 10px;
         overflow-y: auto;
         position: relative;
         box-sizing: border-box;
+        max-height: 175px;
     }
 
     .s25-options {
diff --git a/control/src/style.ts b/control/src/style.ts
index e68f0205..3ab47cd9 100644
--- a/control/src/style.ts
+++ b/control/src/style.ts
@@ -27,5 +27,6 @@ export const enum style {
     searchResultsMinimumError = 's25-search-results-minimum-error',
     hiddenAccessible = 's25-hidden-accessible',
     hidden = 's25-hidden',
-    placeholder = 's25-placeholder'
+    placeholder = 's25-placeholder',
+    scroll = 's25-scroll'
 }
diff --git a/dev/index.html b/dev/index.html
index b25f1232..07b1ef7e 100644
--- a/dev/index.html
+++ b/dev/index.html
@@ -33,7 +33,7 @@
         <input type="text" value="focus grabber 3" />
     </p>
     <section>
-        <input type="hidden" id="colors" s25-style="width:450px" />
+        <input type="hidden" id="colors" data-s25-container-style="width:450px" />
     </section>
 
     <p>