diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38404bc5..63f05100 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.6.21 (2020-04-12)
+
+- add focus game after closing all dialogs (#606)
+- add item frame opacity setting (#607)
+- add standard league as fallback if poe ninja returns no results for selected league
+- add own min max range settings for properties
+- add preselect attack and defense as setting
+- update keyboard support to be always enabled
+- remove quality min/ max restriction (#611)
+- fix move poe overlay to top after focusing poe (#608)
+
 ## 0.6.20 (2020-04-10)
 
 - fix poe overlay losses focus after clicking on it (#602)
diff --git a/README.md b/README.md
index e87b1691..5601134a 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 ![GitHub Release Date](https://img.shields.io/github/release-date/Kyusung4698/PoE-Overlay)
 <a href="https://www.patreon.com/bePatron?u=30666721"><img src="https://c5.patreon.com/external/logo/become_a_patron_button.png" alt="Become a Patron" width="85px" height="20px"></a>
 
-# PoE Overlay 0.6.20
+# PoE Overlay 0.6.21
 
 An Overlay for Path of Exile. The ***core aspect*** is to blend in with the game. Built with Electron and Angular. 
  
@@ -74,11 +74,11 @@ These instructions will set you up to run and enjoy the overlay.
 #### Installing
 
 1. Head over to [Releases](https://github.com/Kyusung4698/PoE-Overlay/releases) and download one of the following files
-    1. `poe-overlay-Setup-0.6.20.exe` to install locally. This supports auto update/ auto launch.
-    2. `poe-overlay-0.6.20.exe` portable version. This does not support auto update/ auto launch.
+    1. `poe-overlay-Setup-0.6.21.exe` to install locally. This supports auto update/ auto launch.
+    2. `poe-overlay-0.6.21.exe` portable version. This does not support auto update/ auto launch.
 2. Run either of your downloaded file
 3. Start Path of Exile
-4. Wait until you can see `PoE Overlay 0.6.20` in the bottom left corner
+4. Wait until you can see `PoE Overlay 0.6.21` in the bottom left corner
 5. Hit `f7` and set `Language` and `League` to meet your game settings
 
 #### Shortcuts
diff --git a/electron/game.ts b/electron/game.ts
index f6c61cd6..cb9dbb64 100644
--- a/electron/game.ts
+++ b/electron/game.ts
@@ -59,23 +59,27 @@ export class Game {
 export function register(ipcMain: IpcMain, onUpdate: (game: Game) => void): void {
     const game = new Game();
 
+    let timeout = undefined;
+    function callback() {
+        clearTimeout(timeout);
+        timeout = setTimeout(() => {
+            onUpdate(game);
+        }, 550);
+    }
+
     ipcMain.on('game-focus', event => {
         game.focus();
         event.returnValue = true;
     });
 
     ipcMain.on('game-send-active-change', event => {
-        onUpdate(game);
+        callback();
         event.returnValue = true;
     });
 
-    let timeout = 0;
     setInterval(() => {
-        if (--timeout < 0 && game.update()) {
-            if (game.active) {
-                timeout = 2;
-            }
-            onUpdate(game);
+        if (game.update()) {
+            callback();
         }
     }, 500);
 }
\ No newline at end of file
diff --git a/electron/state.ts b/electron/state.ts
index 0c523862..462355aa 100644
--- a/electron/state.ts
+++ b/electron/state.ts
@@ -2,19 +2,16 @@ import * as fs from 'fs';
 import * as path from 'path';
 
 const ANIMATION_FILE = 'animation.flag'
-const KEYBOARD_FILE = 'keyboard.flag'
 const VERSION_FILE = 'version.txt'
 
 const FLAG_FILE_VALUE = 'true';
 
 export class State {
     private readonly animationPath: string;
-    private readonly keyboardPath: string;
     private readonly versionPath: string;
 
     constructor(private readonly userDataPath: string) {
         this.animationPath = path.join(this.userDataPath, ANIMATION_FILE);
-        this.keyboardPath = path.join(this.userDataPath, KEYBOARD_FILE);
         this.versionPath = path.join(this.userDataPath, VERSION_FILE);
     }
 
@@ -31,19 +28,6 @@ export class State {
         }
     }
 
-    public get keyboardSupport(): boolean {
-        const keyboardExists = fs.existsSync(this.keyboardPath);
-        return keyboardExists;
-    }
-
-    public set keyboardSupport(enable: boolean) {
-        if (enable) {
-            fs.writeFileSync(this.keyboardPath, FLAG_FILE_VALUE);
-        } else {
-            fs.unlinkSync(this.keyboardPath);
-        }
-    }
-
     public isVersionUpdated(appVersion: string): boolean {
         let versionUpdated = true;
         const versionExists = fs.existsSync(this.versionPath);
diff --git a/main.ts b/main.ts
index 9d925848..02fc50aa 100644
--- a/main.ts
+++ b/main.ts
@@ -174,9 +174,9 @@ function createWindow(): BrowserWindow {
             allowRunningInsecureContent: serve,
             webSecurity: false
         },
-        focusable: state.keyboardSupport,
+        focusable: false,
         skipTaskbar: true,
-        show: false
+        show: false,
     });
     win.removeMenu();
     win.setIgnoreMouseEvents(true);
@@ -281,13 +281,6 @@ function createTray(): Tray {
             label: 'Relaunch', type: 'normal',
             click: () => send('app-relaunch')
         },
-        {
-            label: 'Keyboard Support (experimental)', type: 'checkbox',
-            checked: state.keyboardSupport, click: () => {
-                state.keyboardSupport = !state.keyboardSupport;
-                send('app-relaunch');
-            }
-        },
         {
             label: 'Hardware Acceleration', type: 'checkbox',
             checked: state.hardwareAcceleration, click: () => {
diff --git a/overlay.babel b/overlay.babel
index 08b476b1..4249ffa2 100644
--- a/overlay.babel
+++ b/overlay.babel
@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.6.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.6.1">
     <!--
 
     BabelEdit project file
@@ -2173,6 +2173,64 @@
                             </translation>
                         </translations>
                     </concept_node>
+                    <folder_node>
+                        <name>property</name>
+                        <children>
+                            <concept_node>
+                                <name>range</name>
+                                <definition_loaded>false</definition_loaded>
+                                <description></description>
+                                <comment></comment>
+                                <default_text></default_text>
+                                <translations>
+                                    <translation>
+                                        <language>de-DE</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>en-US</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>es-ES</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>fr-FR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ko-KR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>pl-PL</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>pt-BR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ru-RU</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>th-TH</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>zh-CHS</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>zh-CHT</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                </translations>
+                            </concept_node>
+                        </children>
+                    </folder_node>
                     <concept_node>
                         <name>query</name>
                         <definition_loaded>false</definition_loaded>
@@ -2447,7 +2505,7 @@
                         <name>search</name>
                         <children>
                             <concept_node>
-                                <name>disable-max-range</name>
+                                <name>attack</name>
                                 <definition_loaded>false</definition_loaded>
                                 <description></description>
                                 <comment></comment>
@@ -2473,6 +2531,10 @@
                                         <language>ko-KR</language>
                                         <approved>false</approved>
                                     </translation>
+                                    <translation>
+                                        <language>pl-PL</language>
+                                        <approved>false</approved>
+                                    </translation>
                                     <translation>
                                         <language>pt-BR</language>
                                         <approved>false</approved>
@@ -2485,10 +2547,59 @@
                                         <language>th-TH</language>
                                         <approved>false</approved>
                                     </translation>
+                                    <translation>
+                                        <language>zh-CHS</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>zh-CHT</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                </translations>
+                            </concept_node>
+                            <concept_node>
+                                <name>defense</name>
+                                <definition_loaded>false</definition_loaded>
+                                <description></description>
+                                <comment></comment>
+                                <default_text></default_text>
+                                <translations>
+                                    <translation>
+                                        <language>de-DE</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>en-US</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>es-ES</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>fr-FR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ko-KR</language>
+                                        <approved>false</approved>
+                                    </translation>
                                     <translation>
                                         <language>pl-PL</language>
                                         <approved>false</approved>
                                     </translation>
+                                    <translation>
+                                        <language>pt-BR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ru-RU</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>th-TH</language>
+                                        <approved>false</approved>
+                                    </translation>
                                     <translation>
                                         <language>zh-CHS</language>
                                         <approved>false</approved>
@@ -7379,6 +7490,59 @@
                             </translation>
                         </translations>
                     </concept_node>
+                    <concept_node>
+                        <name>dialog-opacity</name>
+                        <definition_loaded>false</definition_loaded>
+                        <description></description>
+                        <comment></comment>
+                        <default_text></default_text>
+                        <translations>
+                            <translation>
+                                <language>de-DE</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>en-US</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>es-ES</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>fr-FR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>ko-KR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>pl-PL</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>pt-BR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>ru-RU</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>th-TH</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>zh-CHS</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>zh-CHT</language>
+                                <approved>false</approved>
+                            </translation>
+                        </translations>
+                    </concept_node>
                     <folder_node>
                         <name>dialog-spawn-position</name>
                         <children>
diff --git a/package.json b/package.json
index 75728130..08096e34 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "poe-overlay",
-  "version": "0.6.20",
+  "version": "0.6.21",
   "private": true,
   "description": "A Overlay for Path of Exile. Built with Electron and Angular.",
   "main": "main.js",
diff --git a/src/app/core/service/dialog/dialog.service.ts b/src/app/core/service/dialog/dialog.service.ts
index 50612b81..f96a35f1 100644
--- a/src/app/core/service/dialog/dialog.service.ts
+++ b/src/app/core/service/dialog/dialog.service.ts
@@ -4,6 +4,7 @@ import { MatDialog } from '@angular/material/dialog';
 import { Point } from '@app/type';
 import { Observable } from 'rxjs';
 import { tap } from 'rxjs/operators';
+import { GameService } from '../game.service';
 import { WindowService } from '../window.service';
 import { DialogRefService } from './dialog-ref.service';
 
@@ -21,7 +22,8 @@ export class DialogService {
     constructor(
         private readonly dialog: MatDialog,
         private readonly dialogRef: DialogRefService,
-        private readonly window: WindowService) { }
+        private readonly window: WindowService,
+        private readonly game: GameService) { }
 
     public open<T, D, R>(
         componentOrTemplateRef: ComponentType<T> | TemplateRef<T>,
@@ -37,7 +39,10 @@ export class DialogService {
         const left = Math.max(Math.min(scaled.x - width * 0.5, bounds.width - width), 0);
         const top = Math.max(Math.min(scaled.y - height * 0.5, bounds.height - height), 0);
 
-        this.window.enableInput();
+        if (this.dialog.openDialogs.length === 0) {
+            this.window.enableInput();
+        }
+
         const dialogRef = this.dialog.open(componentOrTemplateRef, {
             position: {
                 left: `${left}px`,
@@ -51,6 +56,7 @@ export class DialogService {
         return dialogRef.afterClosed().pipe(tap(() => {
             if (this.dialog.openDialogs.length === 0) {
                 this.window.disableInput();
+                this.game.focus();
             }
             this.dialogRef.remove(close);
         }));
diff --git a/src/app/core/service/game.service.ts b/src/app/core/service/game.service.ts
index e038afc8..71a5ecf8 100644
--- a/src/app/core/service/game.service.ts
+++ b/src/app/core/service/game.service.ts
@@ -1,19 +1,29 @@
 import { Injectable } from '@angular/core';
 import { ElectronProvider } from '@app/provider';
-import { IpcRenderer } from 'electron';
+import { BrowserWindow, IpcRenderer } from 'electron';
 
 @Injectable({
     providedIn: 'root'
 })
 export class GameService {
     private readonly ipcRenderer: IpcRenderer;
+    private readonly window: BrowserWindow;
 
     constructor(
         electronProvider: ElectronProvider) {
         this.ipcRenderer = electronProvider.provideIpcRenderer();
+
+        const electron = electronProvider.provideRemote();
+        this.window = electron.getCurrentWindow();
     }
 
     public focus(): void {
+        this.window.setAlwaysOnTop(false);
+        this.window.setVisibleOnAllWorkspaces(false);
+
         this.ipcRenderer.sendSync('game-focus');
+
+        this.window.setAlwaysOnTop(true, 'pop-up-menu', 1);
+        this.window.setVisibleOnAllWorkspaces(true);
     }
 }
\ No newline at end of file
diff --git a/src/app/core/service/window.service.ts b/src/app/core/service/window.service.ts
index 93170527..01beea27 100644
--- a/src/app/core/service/window.service.ts
+++ b/src/app/core/service/window.service.ts
@@ -59,11 +59,15 @@ export class WindowService {
     }
 
     public disableInput(): void {
+        this.window.blur();
         this.window.setIgnoreMouseEvents(true);
+        this.window.setFocusable(false);
     }
 
     public enableInput(): void {
+        this.window.setFocusable(true);
         this.window.setIgnoreMouseEvents(false);
+        this.window.focus();
     }
 
     public convertToLocal(point: Point): Point {
diff --git a/src/app/data/poe-ninja/service/currency-overview-http.service.ts b/src/app/data/poe-ninja/service/currency-overview-http.service.ts
index f522901f..47fcca1a 100644
--- a/src/app/data/poe-ninja/service/currency-overview-http.service.ts
+++ b/src/app/data/poe-ninja/service/currency-overview-http.service.ts
@@ -40,7 +40,11 @@ export class CurrencyOverviewHttpService {
                 flatMap((response, count) => this.handleError(url, response, count))
             )),
             flatMap(response => {
-                if (!response.lines) {
+                if (!response?.lines) {
+                    if (leagueId !== 'Standard') {
+                        this.logger.info(`Got empty result from '${url}'. Using Standard league for now.`, response);
+                        return this.get('Standard', type);
+                    }
                     this.logger.warn(`Got empty result from '${url}'.`, response);
                     return throwError(`Got empty result from '${url}'.`);
                 }
diff --git a/src/app/data/poe-ninja/service/item-overview-http.service.ts b/src/app/data/poe-ninja/service/item-overview-http.service.ts
index 9194e71f..a2c3e0b1 100644
--- a/src/app/data/poe-ninja/service/item-overview-http.service.ts
+++ b/src/app/data/poe-ninja/service/item-overview-http.service.ts
@@ -68,7 +68,11 @@ export class ItemOverviewHttpService {
                 flatMap((response, count) => this.handleError(url, response, count))
             )),
             flatMap(response => {
-                if (!response.lines) {
+                if (!response?.lines) {
+                    if (leagueId !== 'Standard') {
+                        this.logger.info(`Got empty result from '${url}'. Using Standard league for now.`, response);
+                        return this.get('Standard', type);
+                    }
                     this.logger.warn(`Got empty result from '${url}'.`, response);
                     return throwError(`Got empty result from '${url}'.`)
                 }
diff --git a/src/app/layout/component/user-settings-form/user-settings-form.component.html b/src/app/layout/component/user-settings-form/user-settings-form.component.html
index c75435ba..b0bd7547 100644
--- a/src/app/layout/component/user-settings-form/user-settings-form.component.html
+++ b/src/app/layout/component/user-settings-form/user-settings-form.component.html
@@ -24,7 +24,7 @@
 </app-card>
 <app-card [title]="'settings.dialog' | translate">
     <div class="row">
-        <div class="col">
+        <div class="col-md-6">
             <mat-form-field>
                 <mat-label>{{'settings.dialog-spawn-position-title' | translate}}</mat-label>
                 <mat-select [(value)]="settings.dialogSpawnPosition">
@@ -33,6 +33,19 @@
                 </mat-select>
             </mat-form-field>
         </div>
+        <div class="col-md-6">
+            <div class="value-range">
+                <label class="label"> {{'settings.dialog-opacity' | translate}}:
+                    {{displayWithOpacity(settings.dialogOpacity)}}
+                </label>
+                <div class="slider">
+                    <mat-slider min="0.6" max="1" step="0.1" tickInterval="1" [displayWith]="displayWithOpacity"
+                        [(value)]="settings.dialogOpacity">
+                    </mat-slider>
+                    <span>100%</span>
+                </div>
+            </div>
+        </div>
     </div>
 </app-card>
 <app-card [title]="'settings.app' | translate">
diff --git a/src/app/layout/component/user-settings-form/user-settings-form.component.scss b/src/app/layout/component/user-settings-form/user-settings-form.component.scss
new file mode 100644
index 00000000..ebbedb94
--- /dev/null
+++ b/src/app/layout/component/user-settings-form/user-settings-form.component.scss
@@ -0,0 +1,22 @@
+@import "./../../../../styles/variables";
+
+$label-color: rgba(200, 200, 200, 0.54);
+
+label {
+    display: block;
+    color: $label-color;
+    font-size: 12px;
+    transform: perspective(100px) translateZ(0.001px);
+}
+
+.value-range {
+    > .slider {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+        .mat-slider {
+            width: 100%;
+        }
+    }
+}
diff --git a/src/app/layout/component/user-settings-form/user-settings-form.component.ts b/src/app/layout/component/user-settings-form/user-settings-form.component.ts
index b73148a6..e088e2e0 100644
--- a/src/app/layout/component/user-settings-form/user-settings-form.component.ts
+++ b/src/app/layout/component/user-settings-form/user-settings-form.component.ts
@@ -11,6 +11,7 @@ import { UserSettings } from '../../type';
 @Component({
   selector: 'app-user-settings-form',
   templateUrl: './user-settings-form.component.html',
+  styleUrls: ['./user-settings-form.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class UserSettingsFormComponent implements OnInit {
@@ -24,6 +25,8 @@ export class UserSettingsFormComponent implements OnInit {
   @Input()
   public settings: UserSettings;
 
+  public displayWithOpacity = (value: number) => `${Math.round(value / 1 * 100)}%`;
+
   constructor(
     private readonly leagues: LeaguesService,
     private readonly app: AppService,
diff --git a/src/app/layout/page/overlay/overlay.component.ts b/src/app/layout/page/overlay/overlay.component.ts
index 9fccaaea..bf2cde27 100644
--- a/src/app/layout/page/overlay/overlay.component.ts
+++ b/src/app/layout/page/overlay/overlay.component.ts
@@ -7,8 +7,8 @@ import { AppUpdateState, FeatureModule, VisibleFlag } from '@app/type';
 import { SnackBarService } from '@shared/module/material/service';
 import { ContextService } from '@shared/module/poe/service';
 import { Context } from '@shared/module/poe/type';
-import { BehaviorSubject, Observable } from 'rxjs';
-import { distinctUntilChanged, flatMap, map, tap } from 'rxjs/operators';
+import { BehaviorSubject, EMPTY, Observable, timer } from 'rxjs';
+import { debounce, distinctUntilChanged, flatMap, map, tap } from 'rxjs/operators';
 import { UserSettingsService } from '../../service/user-settings.service';
 import { UserSettings } from '../../type';
 
@@ -59,23 +59,24 @@ export class OverlayComponent implements OnInit, OnDestroy {
       this.translate.use(settings.uiLanguage);
       this.displayVersion$.next(settings.displayVersion);
       this.window.setZoom(settings.zoom / 100);
-      this.context.init(this.getContext(settings));
 
-      this.registerEvents(settings);
-      this.register(settings);
-      this.registerVisibleChange();
+      this.context.init(this.getContext(settings)).subscribe(() => {
+        this.registerEvents(settings);
+        this.register(settings);
+        this.registerVisibleChange();
 
-      this.renderer.on('show-user-settings').subscribe(() => {
-        this.openUserSettings();
-      });
-      this.renderer.on('reset-zoom').subscribe(() => {
-        this.userSettingsService.update(x => {
-          x.zoom = 100;
-          return x;
-        }).subscribe(x => {
-          this.window.setZoom(x.zoom / 100);
+        this.renderer.on('show-user-settings').subscribe(() => {
+          this.openUserSettings();
         });
-      })
+        this.renderer.on('reset-zoom').subscribe(() => {
+          this.userSettingsService.update(x => {
+            x.zoom = 100;
+            return x;
+          }).subscribe(x => {
+            this.window.setZoom(x.zoom / 100);
+          });
+        })
+      });
     });
   }
 
@@ -101,13 +102,13 @@ export class OverlayComponent implements OnInit, OnDestroy {
     this.app.visibleChange().pipe(
       tap(flag => this.shortcut.check(flag)),
       map(flag => flag !== VisibleFlag.None),
+      debounce(show => show ? EMPTY : timer(1500)),
       distinctUntilChanged()
     ).subscribe(show => {
-      if (!show) {
-        this.window.hide();
-      } else {
+      if (show) {
         this.window.show();
-        this.game.focus();
+      } else {
+        this.window.hide();
       }
     });
     this.app.triggerVisibleChange();
diff --git a/src/app/layout/page/user-settings/user-settings.component.ts b/src/app/layout/page/user-settings/user-settings.component.ts
index 86555f79..ee1386c0 100644
--- a/src/app/layout/page/user-settings/user-settings.component.ts
+++ b/src/app/layout/page/user-settings/user-settings.component.ts
@@ -74,12 +74,12 @@ export class UserSettingsComponent implements OnInit {
       this.window.setZoom(settings.zoom / 100);
 
       const { language, leagueId } = settings;
-      this.context.init({ language, leagueId });
+      this.context.init({ language, leagueId }).subscribe(() => {
+        this.settings = settings;
+        this.features = this.settingsService.features();
 
-      this.settings = settings;
-      this.features = this.settingsService.features();
-
-      this.init$.next(true);
+        this.init$.next(true);
+      });
     });
   }
 }
diff --git a/src/app/layout/service/user-settings.service.ts b/src/app/layout/service/user-settings.service.ts
index cc908207..63bbf2bb 100644
--- a/src/app/layout/service/user-settings.service.ts
+++ b/src/app/layout/service/user-settings.service.ts
@@ -39,6 +39,7 @@ export class UserSettingsService {
                     uiLanguage: UiLanguage.English,
                     zoom: 100,
                     dialogSpawnPosition: DialogSpawnPosition.Center,
+                    dialogOpacity: 0.8,
                     displayVersion: true,
                     autoDownload: true
                 };
diff --git a/src/app/layout/type/user-settings.type.ts b/src/app/layout/type/user-settings.type.ts
index 36f7bf26..03e18f22 100644
--- a/src/app/layout/type/user-settings.type.ts
+++ b/src/app/layout/type/user-settings.type.ts
@@ -14,6 +14,7 @@ export interface UserSettings {
     exitAppKeybinding?: string;
     zoom?: number;
     dialogSpawnPosition?: DialogSpawnPosition;
+    dialogOpacity?: number;
     displayVersion?: boolean;
     autoDownload?: boolean;
 }
diff --git a/src/app/modules/evaluate/component/evaluate-dialog/evaluate-dialog.component.html b/src/app/modules/evaluate/component/evaluate-dialog/evaluate-dialog.component.html
index 78a3eccd..d9bb1120 100644
--- a/src/app/modules/evaluate/component/evaluate-dialog/evaluate-dialog.component.html
+++ b/src/app/modules/evaluate/component/evaluate-dialog/evaluate-dialog.component.html
@@ -2,7 +2,8 @@
     <app-item-frame [item]="data.item" [language]="data.language" [queryItem]="queryItem"
         (queryItemChange)="onQueryItemChange($event)" [separator]="true"
         [modifierMinRange]="data.settings.evaluateModifierMinRange / 100"
-        [modifierMaxRange]="data.settings.evaluateModifierMaxRange / 100">
+        [modifierMaxRange]="data.settings.evaluateModifierMaxRange / 100"
+        [opacity]="data.settings.dialogOpacity">
         <ng-container *ngIf="(currencies$ | async) as currencies; else loading">
             <app-evaluate-options [options]="options" (optionsChange)="onOptionsChange($event)" (resetTrigger)="onReset()">
             </app-evaluate-options>
diff --git a/src/app/modules/evaluate/component/evaluate-settings/evaluate-settings.component.html b/src/app/modules/evaluate/component/evaluate-settings/evaluate-settings.component.html
index f315935d..a9bac57f 100644
--- a/src/app/modules/evaluate/component/evaluate-settings/evaluate-settings.component.html
+++ b/src/app/modules/evaluate/component/evaluate-settings/evaluate-settings.component.html
@@ -129,6 +129,49 @@
                 </mat-card>
                 <mat-card>
                     <mat-label> {{'evaluate.search.properties' | translate}} </mat-label>
+
+                    <label class="label"> {{'evaluate.property.range' | translate}}
+                        {{displayWithStat(settings.evaluatePropertyMinRange)}}~{{displayWithStat(settings.evaluatePropertyMaxRange)}}%
+                    </label>
+                    <div class="range">
+                        <span>#</span>
+                        <mat-slider min="0" max="50" step="1" tickInterval="10" invert [displayWith]="displayWithStat"
+                            [(value)]="settings.evaluatePropertyMinRange">
+                        </mat-slider>
+                        <div class="value"
+                            *ngIf="settings.evaluatePropertyMinRange !== 0 || settings.evaluatePropertyMaxRange !== 0;else single">
+                            <span
+                                *ngIf="settings.evaluatePropertyMinRange !== 50;else any">{{50 * ( 1 - (settings.evaluatePropertyMinRange / 100)) | number : '1.0-1'}}</span>
+                            <span>~</span>
+                            <span
+                                *ngIf="settings.evaluatePropertyMaxRange !== 50;else any">{{50 * ( 1 + (settings.evaluatePropertyMaxRange / 100)) | number : '1.0-1'}}</span>
+                            <ng-template #any>#</ng-template>
+                        </div>
+                        <mat-slider min="0" max="50" step="1" tickInterval="10" [displayWith]="displayWithStat"
+                            [(value)]="settings.evaluatePropertyMaxRange">
+                        </mat-slider>
+                        <span>#</span>
+                        <ng-template #single>
+                            <div class="value">
+                                <span>50</span>
+                            </div>
+                        </ng-template>
+                    </div>
+
+                    <div class="toggle">
+                        <mat-slide-toggle [checked]="settings.evaluateQueryDefaultAttack"
+                            (change)="settings.evaluateQueryDefaultAttack = $event.checked">
+                            {{'evaluate.search.attack' | translate}}
+                        </mat-slide-toggle>
+                        <mat-slide-toggle [checked]="settings.evaluateQueryDefaultDefense"
+                            (change)="settings.evaluateQueryDefaultDefense = $event.checked">
+                            {{'evaluate.search.defense' | translate}}
+                        </mat-slide-toggle>
+                        <mat-slide-toggle [checked]="settings.evaluateQueryDefaultMiscs"
+                            (change)="settings.evaluateQueryDefaultMiscs = $event.checked">
+                            {{'evaluate.search.gem' | translate}}
+                        </mat-slide-toggle>
+                    </div>
                     <div class="toggle">
                         <mat-slide-toggle [checked]="settings.evaluateQueryDefaultItemLevel"
                             (change)="settings.evaluateQueryDefaultItemLevel = $event.checked">
@@ -138,10 +181,6 @@
                             (change)="settings.evaluateQueryDefaultType = $event.checked">
                             {{'evaluate.search.item-type' | translate}}
                         </mat-slide-toggle>
-                        <mat-slide-toggle [checked]="settings.evaluateQueryDefaultMiscs"
-                            (change)="settings.evaluateQueryDefaultMiscs = $event.checked">
-                            {{'evaluate.search.gem' | translate}}
-                        </mat-slide-toggle>
                         <mat-form-field>
                             <mat-label>{{'evaluate.search.item-default-links' | translate}}</mat-label>
                             <mat-select [(value)]="settings.evaluateQueryDefaultLinks">
@@ -158,12 +197,7 @@
 
                 <mat-card>
                     <mat-label> {{'evaluate.stats' | translate}} </mat-label>
-                    <div class="toggle">
-                        <mat-slide-toggle [checked]="settings.evaluateQueryDefaultStatsUnique"
-                            (change)="settings.evaluateQueryDefaultStatsUnique = $event.checked">
-                            {{'evaluate.stats-unique-check-all' | translate}}
-                        </mat-slide-toggle>
-                    </div>
+                    
                     <label class="label"> {{'evaluate.stats-range' | translate}}
                         {{displayWithStat(settings.evaluateModifierMinRange)}}~{{displayWithStat(settings.evaluateModifierMaxRange)}}%
                     </label>
@@ -192,6 +226,13 @@
                         </ng-template>
                     </div>
 
+                    <div class="toggle">
+                        <mat-slide-toggle [checked]="settings.evaluateQueryDefaultStatsUnique"
+                            (change)="settings.evaluateQueryDefaultStatsUnique = $event.checked">
+                            {{'evaluate.stats-unique-check-all' | translate}}
+                        </mat-slide-toggle>
+                    </div>
+
                     <app-select-list [items]="stats$ | async" (itemsChange)="onStatsChange($event)">
                         <ng-template let-item>
                             <span class="stat" [title]="item.text">
diff --git a/src/app/modules/evaluate/component/evaluate-settings/evaluate-settings.component.scss b/src/app/modules/evaluate/component/evaluate-settings/evaluate-settings.component.scss
index 4bd935b9..55b84fe0 100644
--- a/src/app/modules/evaluate/component/evaluate-settings/evaluate-settings.component.scss
+++ b/src/app/modules/evaluate/component/evaluate-settings/evaluate-settings.component.scss
@@ -8,7 +8,7 @@ $label-color: rgba(200, 200, 200, 0.54);
   align-items: center;
 
   > * {
-    width: 25%;
+    width: 33.333%;
     padding-right: 15px;
   }
 }
diff --git a/src/app/modules/evaluate/component/evaluate-settings/evaluate-settings.component.ts b/src/app/modules/evaluate/component/evaluate-settings/evaluate-settings.component.ts
index 00e77144..f57eae23 100644
--- a/src/app/modules/evaluate/component/evaluate-settings/evaluate-settings.component.ts
+++ b/src/app/modules/evaluate/component/evaluate-settings/evaluate-settings.component.ts
@@ -28,6 +28,10 @@ export interface EvaluateUserSettings extends UserSettings {
   evaluateQueryDefaultLinks: number;
   evaluateQueryDefaultMiscs: boolean;
   evaluateQueryDefaultType: boolean;
+  evaluateQueryDefaultAttack: boolean;
+  evaluateQueryDefaultDefense: boolean;
+  evaluatePropertyMinRange: number;
+  evaluatePropertyMaxRange: number;
   evaluateQueryDefaultStats: any;
   evaluateQueryDefaultStatsUnique: boolean;
   evaluateQueryOnline: boolean;
diff --git a/src/app/modules/evaluate/evaluate.module.ts b/src/app/modules/evaluate/evaluate.module.ts
index 524b810c..a3148e79 100644
--- a/src/app/modules/evaluate/evaluate.module.ts
+++ b/src/app/modules/evaluate/evaluate.module.ts
@@ -43,6 +43,10 @@ export class EvaluateModule implements FeatureModule {
             evaluateQueryDefaultLinks: 5,
             evaluateQueryDefaultMiscs: true,
             evaluateQueryDefaultType: false,
+            evaluateQueryDefaultAttack: true,
+            evaluateQueryDefaultDefense: true,
+            evaluatePropertyMinRange: 10,
+            evaluatePropertyMaxRange: 50,
             evaluateQueryDefaultStats: {
                 'pseudo.pseudo_total_elemental_resistance': true,
                 'pseudo.pseudo_total_resistance': true,
diff --git a/src/app/modules/evaluate/provider/evaluate-query-item.provider.ts b/src/app/modules/evaluate/provider/evaluate-query-item.provider.ts
index 0f31ff04..adbaba5a 100644
--- a/src/app/modules/evaluate/provider/evaluate-query-item.provider.ts
+++ b/src/app/modules/evaluate/provider/evaluate-query-item.provider.ts
@@ -55,6 +55,26 @@ export class EvaluateQueryItemProvider {
             }
         }
 
+        if (settings.evaluateQueryDefaultAttack) {
+            queryItem.damage = item.damage;
+
+            const prop = item.properties;
+            if (prop) {
+                queryItem.properties.weaponAttacksPerSecond = prop.weaponAttacksPerSecond;
+                queryItem.properties.weaponCriticalStrikeChance = prop.weaponCriticalStrikeChance;
+            }
+        }
+
+        if (settings.evaluateQueryDefaultDefense) {
+            const prop = item.properties;
+            if (prop) {
+                queryItem.properties.armourArmour = prop.armourArmour;
+                queryItem.properties.armourEvasionRating = prop.armourEvasionRating;
+                queryItem.properties.armourEnergyShield = prop.armourEnergyShield;
+                queryItem.properties.shieldBlockChance = prop.shieldBlockChance;
+            }
+        }
+
         if (!settings.evaluateQueryDefaultType) {
             if (item.rarity === ItemRarity.Normal ||
                 item.rarity === ItemRarity.Magic ||
diff --git a/src/app/modules/map/component/map-dialog/map-dialog.component.html b/src/app/modules/map/component/map-dialog/map-dialog.component.html
index c18cb667..41134bcc 100644
--- a/src/app/modules/map/component/map-dialog/map-dialog.component.html
+++ b/src/app/modules/map/component/map-dialog/map-dialog.component.html
@@ -1,5 +1,6 @@
 <div appDrag=".cdk-overlay-pane">
-    <app-item-frame class="map-frame" [item]="data.item" [properties]="properties" [separator]="true">
+    <app-item-frame class="map-frame" [item]="data.item" [properties]="properties" [separator]="true"
+        [opacity]="data.settings.dialogOpacity">
         <ng-container ngProjectAs="properties">
             <div [title]="'map.layout-rating-info' | translate">{{'map.layout-rating' | translate}}: <span
                     class="white">{{(map || {}).layoutRating || '-'}}</span></div>
diff --git a/src/app/modules/map/component/map-dialog/map-dialog.component.spec.ts b/src/app/modules/map/component/map-dialog/map-dialog.component.spec.ts
index 6556230a..15e3d545 100644
--- a/src/app/modules/map/component/map-dialog/map-dialog.component.spec.ts
+++ b/src/app/modules/map/component/map-dialog/map-dialog.component.spec.ts
@@ -35,7 +35,8 @@ describe('MapDialogComponent', () => {
         {
           provide: MAT_DIALOG_DATA,
           useValue: {
-            item: {}
+            item: {},
+            settings: {}
           }
         },
         { provide: ElectronProvider, useClass: ElectronProviderFake }
diff --git a/src/app/shared/module/poe/component/item-frame-level-requirements/item-frame-level-requirements.component.html b/src/app/shared/module/poe/component/item-frame-level-requirements/item-frame-level-requirements.component.html
index 0e981c86..624f99ce 100644
--- a/src/app/shared/module/poe/component/item-frame-level-requirements/item-frame-level-requirements.component.html
+++ b/src/app/shared/module/poe/component/item-frame-level-requirements/item-frame-level-requirements.component.html
@@ -3,7 +3,7 @@
         <app-item-frame-value-group>
             <span>{{'ItemDisplayStringItemLevel' | clientString:language}}:&nbsp;</span>
             <span class="white">
-                <app-item-frame-value [(value)]="item.level" [modifierMinRange]="0" [modifierMaxRange]="0.5">
+                <app-item-frame-value [(value)]="item.level" [minRange]="0" [maxRange]="0.5">
                 </app-item-frame-value>
             </span>
         </app-item-frame-value-group>
diff --git a/src/app/shared/module/poe/component/item-frame-properties/item-frame-properties.component.html b/src/app/shared/module/poe/component/item-frame-properties/item-frame-properties.component.html
index 5985c084..fcd5b65f 100644
--- a/src/app/shared/module/poe/component/item-frame-properties/item-frame-properties.component.html
+++ b/src/app/shared/module/poe/component/item-frame-properties/item-frame-properties.component.html
@@ -89,7 +89,7 @@
                         <span>{{'Quality' | clientString:language}}:&nbsp;</span>
                     </ng-container>
                     <span [class]="prop.augmented ? 'purpel' : 'white'">
-                        <app-item-frame-value [(value)]="prop.value" [modifierMinRange]="0" [modifierMaxRange]="0.5">
+                        <app-item-frame-value [(value)]="prop.value" [minRange]="0" [maxRange]="0.5">
                         </app-item-frame-value>
                     </span>
                 </app-item-frame-value-group>
@@ -107,7 +107,7 @@
         <app-item-frame-value-group>
             <span>{{name}}:&nbsp;</span>
             <span class="white">
-                <app-item-frame-value [(value)]="item.damage[prop]" [modifierMinRange]="0" [modifierMaxRange]="0.5">
+                <app-item-frame-value [(value)]="item.damage[prop]" [minRange]="minRange" [maxRange]="maxRange">
                 </app-item-frame-value>
             </span>
         </app-item-frame-value-group>
@@ -119,7 +119,7 @@
         <app-item-frame-value-group>
             <span>{{key | clientString:language}}:&nbsp;</span>
             <span [class]="prop.augmented ? 'purpel' : 'white'">
-                <app-item-frame-value [(value)]="prop.value" [modifierMinRange]="0" [modifierMaxRange]="0.5">
+                <app-item-frame-value [(value)]="prop.value" [minRange]="minRange" [maxRange]="maxRange">
                 </app-item-frame-value>
             </span>
         </app-item-frame-value-group>
diff --git a/src/app/shared/module/poe/component/item-frame-properties/item-frame-properties.component.ts b/src/app/shared/module/poe/component/item-frame-properties/item-frame-properties.component.ts
index dd868b5a..473d7e59 100644
--- a/src/app/shared/module/poe/component/item-frame-properties/item-frame-properties.component.ts
+++ b/src/app/shared/module/poe/component/item-frame-properties/item-frame-properties.component.ts
@@ -20,6 +20,12 @@ export class ItemFramePropertiesComponent implements OnInit {
   @Input()
   public properties: string[];
 
+  @Input()
+  public minRange: number;
+
+  @Input()
+  public maxRange: number;
+
   public ngOnInit(): void {
     this.properties = this.properties || [
       'weaponCriticalStrikeChance',
diff --git a/src/app/shared/module/poe/component/item-frame-stats/item-frame-stats.component.html b/src/app/shared/module/poe/component/item-frame-stats/item-frame-stats.component.html
index 8fb62e1d..949787b4 100644
--- a/src/app/shared/module/poe/component/item-frame-stats/item-frame-stats.component.html
+++ b/src/app/shared/module/poe/component/item-frame-stats/item-frame-stats.component.html
@@ -62,7 +62,7 @@
                     <span>{{part}}</span>
                     <span [class]="getValueClass(stat.id)">
                         <app-item-frame-value *ngIf="stat.values[index]" [(value)]="stat.values[index]"
-                            [modifierMinRange]="modifierMinRange" [modifierMaxRange]="modifierMaxRange">
+                            [minRange]="modifierMinRange" [maxRange]="modifierMaxRange">
                         </app-item-frame-value>
                     </span>
                 </ng-container>
diff --git a/src/app/shared/module/poe/component/item-frame-value/item-frame-value.component.ts b/src/app/shared/module/poe/component/item-frame-value/item-frame-value.component.ts
index 46abcad1..66023a30 100644
--- a/src/app/shared/module/poe/component/item-frame-value/item-frame-value.component.ts
+++ b/src/app/shared/module/poe/component/item-frame-value/item-frame-value.component.ts
@@ -26,10 +26,10 @@ export class ItemFrameValueComponent implements OnInit {
   public disabled: boolean;
 
   @Input()
-  public modifierMinRange: number;
+  public minRange: number;
 
   @Input()
-  public modifierMaxRange: number;
+  public maxRange: number;
 
   @Input()
   public value: ItemValue;
@@ -225,15 +225,15 @@ export class ItemFrameValueComponent implements OnInit {
       this.value.max = this.default.max;
     }
 
-    // check tier
-    if (this.value.tier) {
-      if (this.value.min < this.value.tier.min) {
-        this.value.min = this.value.tier.min;
-      }
-      if (this.value.max > this.value.tier.max) {
-        this.value.max = this.value.tier.max;
-      }
-    }
+    // check tier - remove for now
+    // if (this.value.tier) {
+    //   if (this.value.min < this.value.tier.min) {
+    //     this.value.min = this.value.tier.min;
+    //   }
+    //   if (this.value.max > this.value.tier.max) {
+    //     this.value.max = this.value.tier.max;
+    //   }
+    // }
 
     // if positive - stay positive!
     if (this.default.min >= 0 && this.value.min < 0) {
@@ -258,10 +258,10 @@ export class ItemFrameValueComponent implements OnInit {
     this.value.max = this.parsed;
     this.default = { ...this.value };
 
-    if (this.modifierMinRange === 0.5) {
-      this.value.min = this.value.tier?.min;
+    if (this.minRange === 0.5) {
+      this.value.min = undefined;
     } else {
-      this.value.min -= this.parsed * this.modifierMinRange;
+      this.value.min -= this.parsed * this.minRange;
       if (Number.isInteger(this.parsed)) {
         this.value.min = Math.floor(this.value.min);
       } else {
@@ -269,10 +269,10 @@ export class ItemFrameValueComponent implements OnInit {
       }
     }
 
-    if (this.modifierMaxRange === 0.5) {
-      this.value.max = this.value.tier?.max;
+    if (this.maxRange === 0.5) {
+      this.value.max = undefined;
     } else {
-      this.value.max += this.parsed * this.modifierMaxRange;
+      this.value.max += this.parsed * this.maxRange;
       if (Number.isInteger(this.parsed)) {
         this.value.max = Math.ceil(this.value.max);
       } else {
diff --git a/src/app/shared/module/poe/component/item-frame/item-frame.component.html b/src/app/shared/module/poe/component/item-frame/item-frame.component.html
index 9880455e..b470da07 100644
--- a/src/app/shared/module/poe/component/item-frame/item-frame.component.html
+++ b/src/app/shared/module/poe/component/item-frame/item-frame.component.html
@@ -1,13 +1,15 @@
-<div class="frame" (mousedown)="onMouseDown($event)" (mouseup)="onMouseUp($event)">
+<div class="frame" [style.background]="'rgba(0,0,0,' + opacity + ')'" (mousedown)="onMouseDown($event)"
+    (mouseup)="onMouseUp($event)">
     <app-item-frame-header [item]="item" [queryItem]="queryItem"
-        [queryable]="item.rarity === 'normal' || item.rarity === 'magic' || item.rarity === 'rare'" [language]="language">
+        [queryable]="item.rarity === 'normal' || item.rarity === 'magic' || item.rarity === 'rare'"
+        [language]="language">
     </app-item-frame-header>
 
     <div class="detail">
         <!-- properties -->
         <ng-container *ngIf="item.properties">
             <app-item-frame-properties [item]="item" [queryItem]="queryItem" [language]="language"
-                [properties]="properties">
+                [properties]="properties" [minRange]="propertyMinRange" [maxRange]="propertyMaxRange">
             </app-item-frame-properties>
             <ng-content select="properties"></ng-content>
             <app-item-frame-separator [item]="item" *ngIf="req || sockets || stats || state || influences || separator">
diff --git a/src/app/shared/module/poe/component/item-frame/item-frame.component.ts b/src/app/shared/module/poe/component/item-frame/item-frame.component.ts
index 48c3b8f4..9554ce39 100644
--- a/src/app/shared/module/poe/component/item-frame/item-frame.component.ts
+++ b/src/app/shared/module/poe/component/item-frame/item-frame.component.ts
@@ -25,11 +25,20 @@ export class ItemFrameComponent implements OnInit {
   @Input()
   public separator = false;
 
+  @Input()
+  public propertyMinRange = 0.1;
+
+  @Input()
+  public propertyMaxRange = 0.5;
+
   @Input()
   public modifierMinRange = 0.1;
 
   @Input()
-  public modifierMaxRange = 0.1;
+  public modifierMaxRange = 0.5;
+
+  @Input()
+  public opacity = 0.8;
 
   @Input()
   public properties: [];
diff --git a/src/app/shared/module/poe/factory/context.factory.spec.ts b/src/app/shared/module/poe/factory/context.factory.spec.ts
new file mode 100644
index 00000000..ecf774b8
--- /dev/null
+++ b/src/app/shared/module/poe/factory/context.factory.spec.ts
@@ -0,0 +1,27 @@
+import { TestBed } from '@angular/core/testing';
+import { SharedModule } from '@shared/shared.module';
+import { ContextFactory } from '.';
+import { Language } from '../type';
+
+describe('ContextFactory', () => {
+    let sut: ContextFactory;
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                SharedModule
+            ]
+        }).compileComponents();
+        sut = TestBed.inject<ContextFactory>(ContextFactory);
+    });
+
+    it(`should reset invalid league id`, (done) => {
+        const invalid = 'invalid';
+        sut.create({
+            language: Language.English,
+            leagueId: invalid
+        }).subscribe(context => {
+            expect(context.leagueId).not.toEqual(invalid);
+            done();
+        }, () => done());
+    });
+});
diff --git a/src/app/shared/module/poe/service/context.service.ts b/src/app/shared/module/poe/service/context.service.ts
index 2faf8317..9b60d3b9 100644
--- a/src/app/shared/module/poe/service/context.service.ts
+++ b/src/app/shared/module/poe/service/context.service.ts
@@ -26,13 +26,4 @@ export class ContextService {
     public update(context: Context): void {
         this.contextSubject.next(context);
     }
-
-    public change(): Observable<Context> {
-        return this.contextSubject.pipe(
-            map(context => {
-                // return copy
-                return { ...context };
-            })
-        );
-    }
 }
diff --git a/src/app/shared/module/poe/service/item/parser/item-post-parser-damage.service.ts b/src/app/shared/module/poe/service/item/parser/item-post-parser-damage.service.ts
index df54bd1d..ad416d03 100644
--- a/src/app/shared/module/poe/service/item/parser/item-post-parser-damage.service.ts
+++ b/src/app/shared/module/poe/service/item/parser/item-post-parser-damage.service.ts
@@ -54,7 +54,7 @@ export class ItemPostParserDamageService implements ItemPostParserService {
         const dps = this.addAps(weaponAttacksPerSecond, damage);
 
         const value: ItemValue = {
-            text: `${dps}`,
+            text: `${Math.round(dps * 10) / 10}`,
             tier: {
                 min: this.addAps(weaponAttacksPerSecond, weaponPhysicalDamage.value.tier.min),
                 max: this.addAps(weaponAttacksPerSecond, weaponPhysicalDamage.value.tier.max),
@@ -73,7 +73,7 @@ export class ItemPostParserDamageService implements ItemPostParserService {
         const dps = this.addAps(weaponAttacksPerSecond, totalDamage);
 
         const value: ItemValue = {
-            text: `${dps}`
+            text: `${Math.round(dps * 10) / 10}`
         };
         return value;
     }
@@ -88,7 +88,7 @@ export class ItemPostParserDamageService implements ItemPostParserService {
         const dps = this.addAps(weaponAttacksPerSecond, damage);
 
         const value: ItemValue = {
-            text: `${dps}`
+            text: `${Math.round(dps * 10) / 10}`
         };
         return value;
     }
diff --git a/src/assets/i18n/english.json b/src/assets/i18n/english.json
index 52e32c03..28a15a0b 100644
--- a/src/assets/i18n/english.json
+++ b/src/assets/i18n/english.json
@@ -54,6 +54,9 @@
 			"default": "Default"
 		},
 		"profiles": "Preselected Profiles",
+		"property": {
+			"range": "Min-Max Range"
+		},
 		"query": "Query",
 		"range": "Range",
 		"result-view": "Result View",
@@ -62,7 +65,8 @@
 			"list": "List"
 		},
 		"search": {
-			"disable-max-range": "Disable Max Range",
+			"attack": "Attack",
+			"defense": "Defense",
 			"filter": "Filter",
 			"gem": "Gem Level, Map Tier & Quality",
 			"item-default-links": "Item Link",
@@ -177,6 +181,7 @@
 		"auto-launch": "Run on Boot",
 		"cancel": "Cancel",
 		"dialog": "Dialog",
+		"dialog-opacity": "Dialog Opacity",
 		"dialog-spawn-position": {
 			"center": "Center",
 			"cursor": "Cursor"
diff --git a/src/assets/i18n/french.json b/src/assets/i18n/french.json
index 26a6e359..b4bf6d76 100644
--- a/src/assets/i18n/french.json
+++ b/src/assets/i18n/french.json
@@ -54,6 +54,9 @@
 			"default": "Défaut"
 		},
 		"profiles": "Profils présélectionnés",
+		"property": {
+			"range": "Gamme Min-Max"
+		},
 		"query": "Question",
 		"range": "Range",
 		"result-view": "Affichage des résultats",
@@ -62,7 +65,8 @@
 			"list": "liste"
 		},
 		"search": {
-			"disable-max-range": "Désactiver la plage maximale",
+			"attack": "Attaque",
+			"defense": "La défense",
 			"filter": "Filtre",
 			"gem": "Niveau de gemme, pallier de carte et qualité",
 			"item-default-links": "Lien d'objet",
@@ -177,6 +181,7 @@
 		"auto-launch": "Exécuter au démarrage",
 		"cancel": "Annuler",
 		"dialog": "Dialogue",
+		"dialog-opacity": "Opacité de la boîte de dialogue",
 		"dialog-spawn-position": {
 			"center": "Centre",
 			"cursor": "Le curseur"
diff --git a/src/assets/i18n/german.json b/src/assets/i18n/german.json
index 2d0a4266..2c53024a 100644
--- a/src/assets/i18n/german.json
+++ b/src/assets/i18n/german.json
@@ -54,6 +54,9 @@
 			"default": "Standard"
 		},
 		"profiles": "Vorausgewählte Profile",
+		"property": {
+			"range": "Min-Max-Bereich"
+		},
 		"query": "Abfrage",
 		"range": "Bereich",
 		"result-view": "Ergebnisansicht",
@@ -62,7 +65,8 @@
 			"list": "Liste"
 		},
 		"search": {
-			"disable-max-range": "Maximalen Wertebereich deaktivieren",
+			"attack": "Attacke",
+			"defense": "Verteidigung",
 			"filter": "Filter",
 			"gem": "Edelsteinstufe, Kartenstufe und -qualität",
 			"item-default-links": "Item Link",
@@ -177,6 +181,7 @@
 		"auto-launch": "Beim Booten ausführen",
 		"cancel": "Abbrechen",
 		"dialog": "Dialog",
+		"dialog-opacity": "Dialogopazität",
 		"dialog-spawn-position": {
 			"center": "Center",
 			"cursor": "Mauszeiger"
diff --git a/src/assets/i18n/korean.json b/src/assets/i18n/korean.json
index 5bfd3438..278bb853 100644
--- a/src/assets/i18n/korean.json
+++ b/src/assets/i18n/korean.json
@@ -54,6 +54,9 @@
 			"default": "태만"
 		},
 		"profiles": "미리 선택된 프로파일",
+		"property": {
+			"range": "최소 최대 범위"
+		},
 		"query": "질문",
 		"range": "Range",
 		"result-view": "결과보기",
@@ -62,7 +65,8 @@
 			"list": "명부"
 		},
 		"search": {
-			"disable-max-range": "최대 범위 비활성화",
+			"attack": "공격",
+			"defense": "방어",
 			"filter": "필터",
 			"gem": "보석 레벨, 지도 등급 및 품질",
 			"item-default-links": "아이템 링크",
@@ -177,6 +181,7 @@
 		"auto-launch": "부팅시 실행",
 		"cancel": "취소",
 		"dialog": "대화",
+		"dialog-opacity": "대화 상자 불투명도",
 		"dialog-spawn-position": {
 			"center": "센터",
 			"cursor": "커서"
diff --git a/src/assets/i18n/polish.json b/src/assets/i18n/polish.json
index 49f7ba9d..c7fc5a48 100644
--- a/src/assets/i18n/polish.json
+++ b/src/assets/i18n/polish.json
@@ -54,6 +54,9 @@
 			"default": "domyślna"
 		},
 		"profiles": "Wstępnie wybrane profile",
+		"property": {
+			"range": "Zakres od minimum do maksimum"
+		},
 		"query": "pytanie",
 		"range": "Zakres",
 		"result-view": "Okno wyników",
@@ -62,7 +65,8 @@
 			"list": "Lista"
 		},
 		"search": {
-			"disable-max-range": "Wyłącz maksymalny zakres",
+			"attack": "Atak",
+			"defense": "Obrona",
 			"filter": "filtr",
 			"gem": "Poziom gemów, map oraz jakość",
 			"item-default-links": "Z połączonymi gniazdami ",
@@ -177,6 +181,7 @@
 		"auto-launch": "Uruchom wraz ze startem systemu",
 		"cancel": "Anuluj",
 		"dialog": "Okno dialogowe",
+		"dialog-opacity": "Okno dialogowe Krycie",
 		"dialog-spawn-position": {
 			"center": "Na środku",
 			"cursor": "Kursor myszy"
diff --git a/src/assets/i18n/portuguese.json b/src/assets/i18n/portuguese.json
index b6c8014f..b82ac9c0 100644
--- a/src/assets/i18n/portuguese.json
+++ b/src/assets/i18n/portuguese.json
@@ -54,6 +54,9 @@
 			"default": "Padrão"
 		},
 		"profiles": "Perfis pré-selecionados",
+		"property": {
+			"range": "Min-Max Range"
+		},
 		"query": "Inquerir",
 		"range": "Range",
 		"result-view": "Visualização de resultados",
@@ -62,7 +65,8 @@
 			"list": "Lista"
 		},
 		"search": {
-			"disable-max-range": "Desativar intervalo máximo",
+			"attack": "Ataque",
+			"defense": "Defesa",
 			"filter": "Filtro",
 			"gem": "Nível da gema, nível do mapa e qualidade",
 			"item-default-links": "Link do item",
@@ -177,6 +181,7 @@
 		"auto-launch": "Executar na inicialização",
 		"cancel": "Cancelar",
 		"dialog": "Diálogo",
+		"dialog-opacity": "Opacidade da caixa de diálogo",
 		"dialog-spawn-position": {
 			"center": "centro",
 			"cursor": "Cursor"
diff --git a/src/assets/i18n/russian.json b/src/assets/i18n/russian.json
index 0bc00f88..b66987d3 100644
--- a/src/assets/i18n/russian.json
+++ b/src/assets/i18n/russian.json
@@ -54,6 +54,9 @@
 			"default": "По умолчанию"
 		},
 		"profiles": "Предварительно выбранные профили",
+		"property": {
+			"range": "Мин-Макс Диапазон"
+		},
 		"query": "запрос",
 		"range": "Разброс",
 		"result-view": "Просмотр результатов",
@@ -62,7 +65,8 @@
 			"list": "Список"
 		},
 		"search": {
-			"disable-max-range": "Отключить максимальный диапазон",
+			"attack": "Атака",
+			"defense": "Защита",
 			"filter": "Фильтр",
 			"gem": "Уровень камня, уровень карты и качества",
 			"item-default-links": "Связи для камней умений",
@@ -177,6 +181,7 @@
 		"auto-launch": "Запустить на включении",
 		"cancel": "Отменить",
 		"dialog": "Диалог",
+		"dialog-opacity": "Непрозрачность диалога",
 		"dialog-spawn-position": {
 			"center": "По центру",
 			"cursor": "У курсора"
diff --git a/src/assets/i18n/simplified-chinese.json b/src/assets/i18n/simplified-chinese.json
index 838a1dba..06a2c0d6 100644
--- a/src/assets/i18n/simplified-chinese.json
+++ b/src/assets/i18n/simplified-chinese.json
@@ -54,6 +54,9 @@
 			"default": "默认"
 		},
 		"profiles": "预选个人资料",
+		"property": {
+			"range": "最小最大范围"
+		},
 		"query": "询问",
 		"range": "范围",
 		"result-view": "结果视图",
@@ -62,7 +65,8 @@
 			"list": "名单"
 		},
 		"search": {
-			"disable-max-range": "禁用最大范围",
+			"attack": "攻击",
+			"defense": "防御",
 			"filter": "过滤",
 			"gem": "宝石等级，地图等级和品质",
 			"item-default-links": "物品链接",
@@ -177,6 +181,7 @@
 		"auto-launch": "开机运行",
 		"cancel": "取消",
 		"dialog": "对话",
+		"dialog-opacity": "对话不透明度",
 		"dialog-spawn-position": {
 			"center": "中央",
 			"cursor": "光标"
diff --git a/src/assets/i18n/spanish.json b/src/assets/i18n/spanish.json
index 796a63f9..3a85a6af 100644
--- a/src/assets/i18n/spanish.json
+++ b/src/assets/i18n/spanish.json
@@ -54,6 +54,9 @@
 			"default": "Defecto"
 		},
 		"profiles": "Perfiles preseleccionados",
+		"property": {
+			"range": "Rango Min-Max"
+		},
 		"query": "consulta",
 		"range": "Range",
 		"result-view": "Vista de resultados",
@@ -62,7 +65,8 @@
 			"list": "Lista"
 		},
 		"search": {
-			"disable-max-range": "Deshabilitar rango máximo",
+			"attack": "Ataque",
+			"defense": "Defensa",
 			"filter": "Filtrar",
 			"gem": "Nivel de gema, nivel de mapa y calidad",
 			"item-default-links": "Enlace de artículo",
@@ -177,6 +181,7 @@
 		"auto-launch": "Ejecutar en arranque",
 		"cancel": "Cancelar",
 		"dialog": "Diálogo",
+		"dialog-opacity": "Diálogo Opacidad",
 		"dialog-spawn-position": {
 			"center": "Centrar",
 			"cursor": "Cursor"
diff --git a/src/assets/i18n/thai.json b/src/assets/i18n/thai.json
index d3b8ac21..8bb387e3 100644
--- a/src/assets/i18n/thai.json
+++ b/src/assets/i18n/thai.json
@@ -54,6 +54,9 @@
 			"default": "ค่าเริ่มต้น"
 		},
 		"profiles": "โปรไฟล์ที่เลือกไว้ล่วงหน้า",
+		"property": {
+			"range": "ช่วง Min-Max"
+		},
 		"query": "สอบถาม",
 		"range": "Range",
 		"result-view": "ดูผลลัพธ์",
@@ -62,7 +65,8 @@
 			"list": "รายการ"
 		},
 		"search": {
-			"disable-max-range": "ปิดการใช้งาน Max Range",
+			"attack": "โจมตี",
+			"defense": "ป้องกัน",
 			"filter": "กรอง",
 			"gem": "ระดับอัญมณีแผนที่ชั้นและคุณภาพ",
 			"item-default-links": "ลิงค์รายการ",
@@ -177,6 +181,7 @@
 		"auto-launch": "ทำงานบน Boot",
 		"cancel": "ยกเลิก",
 		"dialog": "โต้ตอบ",
+		"dialog-opacity": "ความทึบของไดอะล็อก",
 		"dialog-spawn-position": {
 			"center": "ศูนย์",
 			"cursor": "เคอร์เซอร์"
diff --git a/src/assets/i18n/traditional-chinese.json b/src/assets/i18n/traditional-chinese.json
index 7cdc3d9c..0e484912 100644
--- a/src/assets/i18n/traditional-chinese.json
+++ b/src/assets/i18n/traditional-chinese.json
@@ -54,6 +54,9 @@
 			"default": "默認"
 		},
 		"profiles": "預選個人資料",
+		"property": {
+			"range": "最小最大範圍"
+		},
 		"query": "詢問",
 		"range": "範圍",
 		"result-view": "結果視圖",
@@ -62,7 +65,8 @@
 			"list": "名單"
 		},
 		"search": {
-			"disable-max-range": "禁用最大範圍",
+			"attack": "攻擊",
+			"defense": "防禦",
 			"filter": "過濾",
 			"gem": "寶石等級，地圖等級和品質",
 			"item-default-links": "物品鏈接",
@@ -177,6 +181,7 @@
 		"auto-launch": "開機運行",
 		"cancel": "取消",
 		"dialog": "對話",
+		"dialog-opacity": "對話不透明度",
 		"dialog-spawn-position": {
 			"center": "中央",
 			"cursor": "光標"