[BUGFIX] Correct selection of DOM elements