[BUGFIX] Bring back select field button's functionality