diff --git a/01-TestCase/tsg_ui/ui_objects/Object-HTTPSignature-Case.robot b/01-TestCase/tsg_ui/ui_objects/Object-HTTPSignature-Case.robot
index 48cc323..421fb1c 100644
--- a/01-TestCase/tsg_ui/ui_objects/Object-HTTPSignature-Case.robot
+++ b/01-TestCase/tsg_ui/ui_objects/Object-HTTPSignature-Case.robot
@@ -10,7 +10,7 @@ create-http-signature-001
     CreatePage    HTTPSignature    single    656e676c697368636f6e74656e74    reqrestype=res    reqresheader=sck    keywordtext=656e676c697368636f6e74656e74    hex=open
     #验证新建是否成功
     ui-object-search-name    656e676c697368636f6e74656e74
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    656e676c697368636f6e74656e74
     #删除对象
     objects-delete
@@ -20,7 +20,7 @@ edit-http-signature-002
     CreatePage    HTTPSignature    single    text*    reqrestype=res    reqresheader=ct    keywordtext=text*
     #验证新建是否成功
     ui-object-search-name    text*
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    text*
     object-edit-HTTPSignature    text*    req    ck    $mmmm
     ui-object-search-name    text*
@@ -32,7 +32,7 @@ create-http-signature-003
     CreatePage    HTTPSignature    single    *скрипцияк    reqrestype=res    reqresheader=ct    keywordtext=*скрипцияк
     #验证新建是否成功
     ui-object-search-name    *скрипцияк
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    *скрипцияк
     #删除对象
     objects-delete
@@ -42,7 +42,7 @@ create-http-signature-004
     CreatePage    HTTPSignature    single    $支持中文    reqrestype=res    reqresheader=ct    keywordtext=$支持中文
     #验证新建是否成功
     ui-object-search-name    $支持中文
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    $支持中文
     #删除对象
     objects-delete
@@ -52,7 +52,7 @@ create-http-signature-005
     CreatePage    HTTPSignature    single    1234@#%    reqrestype=res    reqresheader=ct    keywordtext=1234@#%
     #验证新建是否成功
     ui-object-search-name    1234@#%
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    1234@#%
     #删除对象
     objects-delete
@@ -62,7 +62,7 @@ create-http-signature-006
     CreatePage    HTTPSignature    single    text*    reqrestype=res    reqresheader=ct    keywordtext=text*
     #验证新建是否成功
     ui-object-search-name    text*
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    text*
     #删除对象
     objects-delete
@@ -72,7 +72,7 @@ create-http-signature-007
     CreatePage    HTTPSignature    single    *скрипцияк    reqrestype=res    reqresheader=sck    keywordtext=*скрипцияк
     #验证新建是否成功
     ui-object-search-name    *скрипцияк
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    *скрипцияк
     #删除对象
     objects-delete
@@ -82,7 +82,7 @@ create-http-signature-008
     CreatePage    HTTPSignature    single    $支持中文    reqrestype=res    reqresheader=sck    keywordtext=$支持中文
     #验证新建是否成功
     ui-object-search-name    $支持中文
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    $支持中文
     #删除对象
     objects-delete
@@ -92,7 +92,7 @@ create-http-signature-009
     CreatePage    HTTPSignature    single    1234@#%    reqrestype=res    reqresheader=sck    keywordtext=1234@#%
     #验证新建是否成功
     ui-object-search-name    1234@#%
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    1234@#%
     #删除对象
     objects-delete
@@ -102,7 +102,7 @@ create-http-signature-010
     CreatePage    HTTPSignature    single    mmmm*    reqrestype=res    reqresheader=sck    keywordtext=mmmm*
     #验证新建是否成功
     ui-object-search-name    mmmm*
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    mmmm*
     #删除对象
     objects-delete
@@ -112,7 +112,7 @@ create-http-signature-011
     CreatePage    HTTPSignature    single    *скрипцияк    reqrestype=req    reqresheader=ck    keywordtext=*скрипцияк
     #验证新建是否成功
     ui-object-search-name    *скрипцияк
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    *скрипцияк
     #删除对象
     objects-delete
@@ -122,7 +122,7 @@ create-http-signature-012
     CreatePage    HTTPSignature    single    $支持中文    reqrestype=req    reqresheader=ck    keywordtext=$支持中文
     #验证新建是否成功
     ui-object-search-name    $支持中文
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    $支持中文
     #删除对象
     objects-delete
@@ -132,7 +132,7 @@ create-http-signature-013
     CreatePage    HTTPSignature    single    1234@#%    reqrestype=req    reqresheader=ck    keywordtext=1234@#%
     #验证新建是否成功
     ui-object-search-name    1234@#%
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    1234@#%
     #删除对象
     objects-delete
@@ -142,7 +142,7 @@ create-http-signature-014
     CreatePage    HTTPSignature    single    mmmm*    reqrestype=req    reqresheader=ck    keywordtext=mmmm*
     #验证新建是否成功
     ui-object-search-name    mmmm*
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    mmmm*
     #删除对象
     objects-delete
@@ -152,7 +152,7 @@ create-http-signature-015
     CreatePage    HTTPSignature    single    *скрипцияк    reqrestype=req    reqresheader=ua    keywordtext=*скрипцияк
     #验证新建是否成功
     ui-object-search-name    *скрипцияк
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    *скрипцияк
     #删除对象
     objects-delete
@@ -162,7 +162,7 @@ create-http-signature-016
     CreatePage    HTTPSignature    single    $支持中文    reqrestype=req    reqresheader=ua    keywordtext=$支持中文
     #验证新建是否成功
     ui-object-search-name    $支持中文
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    $支持中文
     #删除对象
     objects-delete
@@ -172,7 +172,7 @@ create-http-signature-017
     CreatePage    HTTPSignature    single    1234@#%    reqrestype=req    reqresheader=ua    keywordtext=1234@#%
     #验证新建是否成功
     ui-object-search-name    1234@#%
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    1234@#%
     #删除对象
     objects-delete
@@ -182,7 +182,7 @@ create-http-signature-018
     CreatePage    HTTPSignature    single    mmmm*    reqrestype=req    reqresheader=ua    keywordtext=mmmm*
     #验证新建是否成功
     ui-object-search-name    mmmm*
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    mmmm*
     #删除对象
     objects-delete
@@ -192,7 +192,7 @@ create-http-signature-019
     CreatePage    HTTPSignature    single    w    reqrestype=req    reqresheader=ua    keywordtext=www.*
     #验证新建是否成功
     ui-object-search-name    w
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    w
     #删除对象
     objects-delete
@@ -202,7 +202,7 @@ create-http-signature-020
     CreatePage    HTTPSignature    single    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111    reqrestype=req    reqresheader=ua    keywordtext=www.*
     #验证新建是否成功
     ui-object-search-name    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
     #删除对象
     objects-delete
@@ -215,6 +215,7 @@ create-http-signature-021
     #验证新建是否成功
     ui-object-search-name    group中@enция
     objects-delete
+    clear-object-search    HTTPSignature
     ui-object-search-name    中@enция
     objects-delete  
  
@@ -226,6 +227,7 @@ create-http-signature-022
     #验证新建是否成功
     ui-object-search-name    group中@enция
     objects-delete
+    clear-object-search    HTTPSignature
     ui-object-search-name    w
     objects-delete
 
@@ -237,6 +239,7 @@ create-http-signature-023
     #验证新建是否成功
     ui-object-search-name    group中@enция
     objects-delete
+    clear-object-search    HTTPSignature
     ui-object-search-name    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
     objects-delete  
     
@@ -249,8 +252,10 @@ create-http-signature-024
     #验证新建是否成功
     ui-object-search-name    group中@enция
     objects-delete
+    clear-object-search    HTTPSignature
     ui-object-search-name    中@enция
     objects-delete
+    clear-object-search    HTTPSignature
     ui-object-search-name    w
     objects-delete 
     
diff --git a/01-TestCase/tsg_ui/ui_objects/Object_Account_Case.robot b/01-TestCase/tsg_ui/ui_objects/Object_Account_Case.robot
index b60e996..0e394ce 100644
--- a/01-TestCase/tsg_ui/ui_objects/Object_Account_Case.robot
+++ b/01-TestCase/tsg_ui/ui_objects/Object_Account_Case.robot
@@ -12,7 +12,7 @@ edit-account-001
     #验证新建是否成功
     ui-object-search-name    00000
     sleep    2
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    00000
     #修改Account
     object-edit-account    00000    $0000  
@@ -25,7 +25,7 @@ create-account-002
     CreatePage    Account    single    *скрипцияк    keywordtext=*скрипцияк
     #验证新建是否成功
     ui-object-search-name    *скрипцияк
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    *скрипцияк
     #删除对象
     objects-delete
@@ -35,7 +35,7 @@ create-account-003
     CreatePage    Account    single    $支持中文    keywordtext=$支持中文
     #验证新建是否成功
     ui-object-search-name    $支持中文
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    $支持中文
     #删除对象
     objects-delete
@@ -45,7 +45,7 @@ create-account-004
     CreatePage    Account    single    1234@#%    keywordtext=1234@#%
     #验证新建是否成功
     ui-object-search-name    1234@#%
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    1234@#%
     #删除对象
     objects-delete
@@ -55,7 +55,7 @@ create-account-005
     CreatePage    Account    single    www.*    keywordtext=www.*
     #验证新建是否成功
     ui-object-search-name    www.*
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    www.*
     #删除对象
     objects-delete
@@ -65,7 +65,7 @@ create-account-006
     CreatePage    Account    single    w    keywordtext=www.*
     #验证新建是否成功
     ui-object-search-name    w
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    xpath=xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    w
     #删除对象
     objects-delete
@@ -75,7 +75,7 @@ create-account-007
     CreatePage    Account    single    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111    keywordtext=www.*
     #验证新建是否成功
     ui-object-search-name    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    ${text}    get text    xpath=xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
     #删除对象
     objects-delete
@@ -88,6 +88,7 @@ create-account-008
     #验证新建是否成功
     ui-object-search-name    group中@enция
     objects-delete
+    clear-object-search    Account
     ui-object-search-name    中@enция
     objects-delete
  
@@ -99,6 +100,7 @@ create-account-009
     #验证新建是否成功
     ui-object-search-name    group中@enция
     objects-delete
+    clear-object-search    Account
     ui-object-search-name    w
     objects-delete
 
@@ -110,6 +112,7 @@ create-account-010
     #验证新建是否成功
     ui-object-search-name    group中@enция
     objects-delete
+    clear-object-search    Account
     ui-object-search-name    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
     objects-delete
     
@@ -122,8 +125,10 @@ create-account-011
     #验证新建是否成功
     ui-object-search-name    group中@enция
     objects-delete
+    clear-object-search    Account
     ui-object-search-name    中@enция
     objects-delete
+    clear-object-search    Account
     ui-object-search-name    w
     objects-delete
 
diff --git a/01-TestCase/tsg_ui/ui_objects/Object_Fqdn_Case.robot b/01-TestCase/tsg_ui/ui_objects/Object_Fqdn_Case.robot
index 88ba458..81a5d5d 100644
--- a/01-TestCase/tsg_ui/ui_objects/Object_Fqdn_Case.robot
+++ b/01-TestCase/tsg_ui/ui_objects/Object_Fqdn_Case.robot
@@ -87,6 +87,7 @@ create-fqdn-008
     #验证新建是否成功
     ui-object-search-name    group中@enция
     objects-delete
+    clear-object-search    FQDN
     ui-object-search-name    中@enция
     objects-delete  
  
@@ -98,6 +99,7 @@ create-fqdn-009
     #验证新建是否成功
     ui-object-search-name    group中@enция
     objects-delete
+    clear-object-search    FQDN
     ui-object-search-name    w
     objects-delete
 
@@ -109,6 +111,7 @@ create-fqdn-010
     #验证新建是否成功
     ui-object-search-name    group中@enция
     objects-delete
+    clear-object-search    FQDN
     ui-object-search-name    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
     objects-delete   
     
@@ -121,8 +124,10 @@ create-fqdn-011
     #验证新建是否成功
     ui-object-search-name    group中@enция
     objects-delete
+    clear-object-search    FQDN
     ui-object-search-name    中@enция
     objects-delete
+    clear-object-search    FQDN
     ui-object-search-name    w
     objects-delete 
     
diff --git a/01-TestCase/tsg_ui/ui_objects/Object_Ip_Case.robot b/01-TestCase/tsg_ui/ui_objects/Object_Ip_Case.robot
index 7a5b6b5..bd24cdd 100644
--- a/01-TestCase/tsg_ui/ui_objects/Object_Ip_Case.robot
+++ b/01-TestCase/tsg_ui/ui_objects/Object_Ip_Case.robot
@@ -126,6 +126,7 @@ create-addressgroup-ip-012
     Should Be Equal As Strings    ${text}    create-addressgroup-ip-012
     #删除对象
     objects-delete
+    clear-object-search    IP
     ui-object-search-name    create-address-ipv4-002
     objects-delete
     
@@ -143,8 +144,10 @@ create-addressgroup-ip-013
     Should Be Equal As Strings    ${text}    create-addressgroup-ip-013
     #删除对象
     objects-delete
+    clear-object-search    IP
     ui-object-search-name    create-address-ipv4-002
     objects-delete
+    clear-object-search    IP
     ui-object-search-name    create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres
     objects-delete
     
@@ -160,6 +163,7 @@ create-addressgroup-ip-014
     Should Be Equal As Strings    ${text}    L
     #删除对象
     objects-delete
+    clear-object-search    IP
     ui-object-search-name    create-address-ipv4-002
     objects-delete
     
@@ -175,6 +179,7 @@ create-addressgroup-ip-015
     Should Be Equal As Strings    ${text}    create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres
     #删除对象
     objects-delete
+    clear-object-search    IP
     ui-object-search-name    create-address-ipv4-002
     objects-delete
     
@@ -190,6 +195,7 @@ create-addressgroup-ip-016
     Should Be Equal As Strings    ${text}    中abcДдБб!@#123
     #删除对象
     objects-delete
+    clear-object-search    IP
     ui-object-search-name    create-address-ipv4-002
     objects-delete
     
@@ -206,6 +212,7 @@ create-addressgroup-geography-017
     Should Be Equal As Strings    ${text}    中abcДдБб!@#123
     #删除对象
     objects-delete
+    clear-object-search    IP
     ui-object-search-name    create-address-geography-country-008
     objects-delete
     
@@ -226,8 +233,10 @@ create-addressgroup-geography-018
     Should Be Equal As Strings    ${text}    中abcДдБб!@#123
     #删除对象
     objects-delete
+    clear-object-search    IP
     ui-object-search-name    create-address-geography-country-008
     objects-delete
+    clear-object-search    IP
     ui-object-search-name    create-address-geography-countryandcity-011
     objects-delete
 edit-address-ipv4-019
diff --git a/01-TestCase/tsg_ui/ui_objects/Object_Keywords_Case.robot b/01-TestCase/tsg_ui/ui_objects/Object_Keywords_Case.robot
index e82b34d..8be13b1 100644
--- a/01-TestCase/tsg_ui/ui_objects/Object_Keywords_Case.robot
+++ b/01-TestCase/tsg_ui/ui_objects/Object_Keywords_Case.robot
@@ -11,7 +11,7 @@ edit-keywords-001
     CreatePage    Key    single    *pppp    keywordtext=*pppp
     #验证新建是否成功
     ui-object-search-name    *pppp
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    ${text}    get text    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    *pppp
     object-edit-keywords   *pppp    656e676c6973    hex=open  
     ui-object-search-name    *pppp
@@ -23,7 +23,7 @@ create-keywords-002
     CreatePage    Key    single    656e676c6973    keywordtext=656e676c6973    hex=open
     #验证新建是否成功
     ui-object-search-name    656e676c6973
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    ${text}    get text    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    656e676c6973
     #删除对象
     objects-delete
@@ -33,7 +33,7 @@ create-keywords-003
     CreatePage    Key    single    *скрипцияк    keywordtext=*скрипцияк
     #验证新建是否成功
     ui-object-search-name    *скрипцияк
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    ${text}    get text    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    *скрипцияк
     #删除对象
     objects-delete
@@ -96,6 +96,7 @@ create-keywords-009
     #验证新建是否成功
     ui-object-search-name    group中@enция
     objects-delete
+    clear-object-search    Key
     ui-object-search-name    中@enция
     objects-delete  
  
@@ -107,6 +108,7 @@ create-keywords-010
     #验证新建是否成功
     ui-object-search-name    group中@enция
     objects-delete
+    clear-object-search    Key
     ui-object-search-name    w
     objects-delete
 
@@ -118,6 +120,7 @@ create-keywords-011
     #验证新建是否成功
     ui-object-search-name    group中@enция
     objects-delete
+    clear-object-search    Key
     ui-object-search-name    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
     objects-delete 
     
@@ -130,8 +133,10 @@ create-keywords-012
     #验证新建是否成功
     ui-object-search-name    group中@enция
     objects-delete
+    clear-object-search    Key
     ui-object-search-name    中@enция
     objects-delete
+    clear-object-search    Key
     ui-object-search-name    w
     objects-delete  
     
diff --git a/01-TestCase/tsg_ui/ui_objects/Object_Subscriber_Id_Case.robot b/01-TestCase/tsg_ui/ui_objects/Object_Subscriber_Id_Case.robot
index 6a322ea..b35267f 100644
--- a/01-TestCase/tsg_ui/ui_objects/Object_Subscriber_Id_Case.robot
+++ b/01-TestCase/tsg_ui/ui_objects/Object_Subscriber_Id_Case.robot
@@ -11,7 +11,7 @@ edit-subscriber-id-001
     CreatePage    SubscriberID    single    $test37    keywordtext=$test37
     #验证新建是否成功
     ui-object-search-name    $test37
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    $test37
     #修改
     object-edit-Subscriber-ID    $test37    $test35  
@@ -24,7 +24,7 @@ create-subscriber-id-002
     CreatePage    SubscriberID    single    $abc_@%-+123中ДдБб    keywordtext=$abc_@%-+123中ДдБб
     #验证新建是否成功
     ui-object-search-name    $abc_@%-+123中ДдБб
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    $abc_@%-+123中ДдБб
     #删除对象
     objects-delete
@@ -34,7 +34,7 @@ create-subscriber-id-003
     CreatePage    SubscriberID    single    $test37    keywordtext=$test37
     #验证新建是否成功
     ui-object-search-name    $test37
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    $test37
     #删除对象
     objects-delete
@@ -44,7 +44,7 @@ create-subscriber-id-004
     CreatePage    SubscriberID    single    $支持中文    keywordtext=$www.result.cn
     #验证新建是否成功
     ui-object-search-name    $支持中文
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    $支持中文
     #删除对象
     objects-delete
@@ -54,7 +54,7 @@ create-subscriber-id-005
     CreatePage    SubscriberID    single    w    keywordtext=$www.node.com
     #验证新建是否成功
     ui-object-search-name    w
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    w
     #删除对象
     objects-delete
@@ -64,7 +64,7 @@ create-subscriber-id-006
     CreatePage    SubscriberID    single    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111    keywordtext=$www.node.com
     #验证新建是否成功
     ui-object-search-name    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
     #删除对象
     objects-delete
@@ -77,6 +77,7 @@ create-subscriber-id-007
     #验证新建是否成功
     ui-object-search-name    group中@enция
     objects-delete
+    clear-object-search    SubscriberID
     ui-object-search-name    中@enция
     objects-delete  
  
@@ -88,6 +89,7 @@ create-subscriber-id-008
     #验证新建是否成功
     ui-object-search-name    group中@enция
     objects-delete
+    clear-object-search    SubscriberID
     ui-object-search-name    w
     objects-delete
 
@@ -99,6 +101,7 @@ create-subscriber-id-009
     #验证新建是否成功
     ui-object-search-name    group中@enция
     objects-delete
+    clear-object-search    SubscriberID
     ui-object-search-name    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
     objects-delete 
     
@@ -111,8 +114,10 @@ create-subscriber-id-010
     #验证新建是否成功
     ui-object-search-name    group中@enция
     objects-delete
+    clear-object-search    SubscriberID
     ui-object-search-name    中@enция
     objects-delete
+    clear-object-search    SubscriberID
     ui-object-search-name    w
     objects-delete 
     
diff --git a/01-TestCase/tsg_ui/ui_objects/Object_Url_Case.robot b/01-TestCase/tsg_ui/ui_objects/Object_Url_Case.robot
index 2a5a71e..6b97fa8 100644
--- a/01-TestCase/tsg_ui/ui_objects/Object_Url_Case.robot
+++ b/01-TestCase/tsg_ui/ui_objects/Object_Url_Case.robot
@@ -11,7 +11,7 @@ edit-url-001
     CreatePage    URL    single    *.com    keywordtext=*.com
     #验证新建是否成功
     ui-object-search-name    *.com
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span    
     Should Be Equal As Strings    ${text}    *.com
     object-edit-url   *.com    www.*  
     ui-object-search-name    *.com
@@ -23,7 +23,7 @@ create-url-002
     CreatePage    URL    single    *скрипцияк    keywordtext=*скрипцияк
     #验证新建是否成功
     ui-object-search-name    *скрипцияк
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    *скрипцияк
     #删除对象
     objects-delete
@@ -33,7 +33,7 @@ create-url-003
     CreatePage    URL    single    $支持中文    keywordtext=$支持中文
     #验证新建是否成功
     ui-object-search-name    $支持中文
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    $支持中文
     #删除对象
     objects-delete
@@ -43,7 +43,7 @@ create-url-004
     CreatePage    URL    single    1234@#%    keywordtext=1234@#%
     #验证新建是否成功
     ui-object-search-name    1234@#%
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    1234@#%
     #删除对象
     objects-delete
@@ -53,7 +53,7 @@ create-url-005
     CreatePage    URL    single    www.*    keywordtext=www.*
     #验证新建是否成功
     ui-object-search-name    www.*
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    www.*
     #删除对象
     objects-delete
@@ -63,7 +63,7 @@ create-url-006
     CreatePage    URL    single    w    keywordtext=www.*
     #验证新建是否成功
     ui-object-search-name    w
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    w
     #删除对象
     objects-delete
@@ -73,7 +73,7 @@ create-url-007
     CreatePage    URL    single    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111    keywordtext=www.*
     #验证新建是否成功
     ui-object-search-name    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span
+    ${text}    get text    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span
     Should Be Equal As Strings    ${text}    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
     #删除对象
     objects-delete
@@ -86,6 +86,7 @@ create-url-008
     #验证新建是否成功
     ui-object-search-name    group中@enция
     objects-delete
+    clear-object-search    URL
     ui-object-search-name    中@enция
     objects-delete  
  
@@ -97,6 +98,7 @@ create-url-009
     #验证新建是否成功
     ui-object-search-name    group中@enция
     objects-delete
+    clear-object-search    URL
     ui-object-search-name    w
     objects-delete
 
@@ -108,6 +110,7 @@ create-url-010
     #验证新建是否成功
     ui-object-search-name    group中@enция
     objects-delete
+    clear-object-search    URL
     ui-object-search-name    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
     objects-delete  
     
@@ -120,8 +123,10 @@ create-url-011
     #验证新建是否成功
     ui-object-search-name    group中@enция
     objects-delete
+    clear-object-search    URL
     ui-object-search-name    中@enция
     objects-delete
+    clear-object-search    URL
     ui-object-search-name    w
     objects-delete 
     
diff --git a/02-Keyword/tsg_ui/objects/NewObject.robot b/02-Keyword/tsg_ui/objects/NewObject.robot
index 674de7a..60aa6e8 100644
--- a/02-Keyword/tsg_ui/objects/NewObject.robot
+++ b/02-Keyword/tsg_ui/objects/NewObject.robot
@@ -68,23 +68,27 @@ Create-item
     ...    AND    sleep    1
     ...    AND    click element    id=interceptionadd_allcancelobject
     ...    AND    sleep    1
-    run keyword if    "${objectform}"=="FQDN" or "${objectform}"=="URL" or "${objectform}"=="Account"    run keywords    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div[1]
+    run keyword if    "${objectform}"=="FQDN" or "${objectform}"=="URL" or "${objectform}"=="Account"    run keywords    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div[1]    
     ...    AND    sleep    1
     ...    AND    Create-keyword-text    ${objectform}    ${keywordtext}
     ...    AND    sleep    1
     ...    AND    Create-item-ok    ${objectform}
-    run keyword if    '${objectform}'=='Key'    run keywords    click element    id=objectAddItemAdd
+    run keyword if    '${objectform}'=='Key'    run keywords    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div[1]
     ...    AND    sleep    1
     ...    AND    Create-Key-text    ${keywordtext}
     ...    AND    Create-Key-hexmode    ${hex}
     ...    AND    Create-item-ok    ${objectform}
-    run keyword if    '${objectform}'=='HTTPSignature'    run keywords    click element    id=objectAddItemAdd
+    run keyword if    '${objectform}'=='HTTPSignature'    run keywords    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div[1]/i
     ...    AND    sleep    1
     ...    AND    Create-ReqRes-type    ${reqrestype}
     ...    AND    Create-ReqRes-header    ${reqrestype}    ${reqresheader}
     ...    AND    Create-ReqRes-text    ${keywordtext}
     ...    AND    Create-ReqRes-hexmode    ${hex}
     ...    AND    Create-item-ok    ${objectform}
+    run keyword if    '${objectform}'=='SubscriberID'    run keywords    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div[1]/i
+    ...    AND    sleep    1
+    ...    AND    Create-SubscriberID-text    ${keywordtext}
+    ...    AND    sleep    1
 
 Create-item--groupadd
 
@@ -305,7 +309,7 @@ Create-keyword-text
     ...    ELSE IF    "${type}"=="Category"    run keywords    sleep    1
     ...    AND    input text    id=object_fqdn0    ${keywordtext}
     ...    ELSE IF    "${type}"=="Account"    run keywords    sleep    1
-    ...    AND    input text    id=object_account0    ${keywordtext}
+    ...    AND    input text    xpath=/html/body/div[1]/div/div[3]/div[2]/div/div[1]/div[7]/div[1]/div[1]/form/div/div/div/div/div[1]/input   ${keywordtext}
     ...    ELSE    log    2
 Create-keyword-text-group
     [Arguments]    ${type}    ${keywordtext}
@@ -349,7 +353,7 @@ Create-ReqRes-text
 Create-ReqRes-hexmode
     [Arguments]    ${hex}
     sleep    1
-    run keyword if    "${hex}"=="open"    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[6]/div[1]/div[1]/form/div/div[4]/div/div/span
+    run keyword if    "${hex}"=="open"    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[4]/div[1]/div[1]/form/div/div[4]/div/div/span
     sleep    1
 
 Create-Key-text
@@ -361,7 +365,13 @@ Create-Key-text
 Create-Key-hexmode
     [Arguments]    ${hex}
     sleep    1
-    run keyword if    "${hex}"=="open"    click element    xpath=//*[@id="objects_httpBodyKeywords1"]/div[1]/div[1]/form/div/div[2]/div/div/span
+    run keyword if    "${hex}"=="open"    click element    xpath=//*[@id="objects_httpBodyKeywords1"]/div[1]/div[1]/form/div/div[2]/div/div
+    sleep    1
+    
+Create-SubscriberID-text
+    [Arguments]    ${keywordtext}
+    sleep    1
+    input text    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div[4]/div[1]/div[1]/div[2]/div[1]/div/form/div[1]/div/div[1]/input    ${keywordtext}
     sleep    1
 
 objects-delete
@@ -378,9 +388,9 @@ object-edit-fqdn
     Sleep    2
     NewObject.Create-name    ${name}
     Sleep    1
-    click element    id=objectAddEdit
+    click element    id=editForm0
     Sleep    1
-    input text    id=object_fqdn0    ${keywordtext}
+    input text    id=object_fqdn0${name}    ${keywordtext}
     Sleep    1
     click element    id=objectAddItemFqdnOk
     Sleep    1
@@ -394,11 +404,9 @@ object-edit-Subscriber-ID
     Sleep    2
     NewObject.Create-name    ${name}
     Sleep    1
-    click element    id=objectAddEdit
+    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[4]/div/div[4]/div[1]/div[1]/div[2]/div[1]/div[2]/div/div[2]/i[1]
     Sleep    1
-    input text    id=object_sub0    ${keywordtext}
-    Sleep    1
-    click element    id=objectAddItemSubOk
+    input text    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[4]/div/div[4]/div[1]/div[1]/div[2]/div[1]/div[2]/div/div[1]/form/div/div/div/div[2]/div/input    ${keywordtext}
     Sleep    1
     click element    id=objectAdd_ok
     Sleep    2
@@ -410,9 +418,9 @@ object-edit-url
     Sleep    2
     NewObject.Create-name    ${name}
     Sleep    1
-    click element    id=objectAddEdit
+    click element    id=editForm0
     Sleep    1
-    input text    id=object_url0    ${keywordtext}
+    input text    xpath=/html/body/div[1]/div/div[3]/div[2]/div/div[1]/div[5]/div[1]/div[1]/form/div/div/div/div/div/input    ${keywordtext}
     Sleep    1
     click element    id=objectAddItemUrlOk
     Sleep    1
@@ -426,9 +434,9 @@ object-edit-account
     Sleep    2
     NewObject.Create-name    ${name}
     Sleep    1
-    click element    id=objectAddEdit
+    click element    id=editForm0
     Sleep    1
-    input text    id=object_account0    ${keywordtext}
+    input text    xpath=/html/body/div[1]/div/div[3]/div[2]/div/div[1]/div[7]/div[1]/div[1]/form/div/div/div/div/div/input    ${keywordtext}
     Sleep    1
     click element    id=objectItemAccountOk
     Sleep    1
@@ -442,9 +450,9 @@ object-edit-keywords
     Sleep    2
     NewObject.Create-name    ${name}
     Sleep    1
-    click element    id=objectAddEdit
+    click element    id=editForm0
     Sleep    1
-    input text    id=object_key0    ${keywordtext}
+    input text    id=object_url0${name}    ${keywordtext}
     Sleep    1
     NewObject.Create-Key-hexmode    ${hex}
     Sleep    1
@@ -455,19 +463,29 @@ object-edit-keywords
 
 ui-object-search-name
     [Arguments]    ${name}
+    
     sleep    2
     click element    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[1]/span/div/div/div[2]/div/div/div/input    #点击输入框
     sleep    2
-    click element    xpath=/html/body/div/div[1]/div[1]/ul/li[3]    #点击name为搜索类型
+    click element    xpath=/html/body/div/div[1]/div[1]/ul/li[3]    #点击name为搜索类型    
     sleep    2
     input text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[1]/span/div/div/div[2]/div/div[1]/div[3]/div/input    ${name}    #输入搜索内容
     sleep    2
     click element    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[1]/span/div/i    #点击搜索按钮
     sleep    2
-    click element    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]    #选择搜索到的列表
+    click element    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/span    #选择搜索到的列表
     sleep    2
 
-
+clear-object-search
+    [Arguments]    ${type}
+    sleep    2
+    run keyword if    "${type}"=="Key"    click element    id=sidebarObjects_keywords
+    run keyword if    "${type}"=="Account"    click element    id=sidebarObjects_account
+    run keyword if    "${type}"=="URL"    click element    id=sidebarObjects_url
+    run keyword if    "${type}"=="HTTPSignature"    click element    id=sidebarObjects_http_signature
+    run keyword if    "${type}"=="SubscriberID"    click element    id=sidebarObjects_subscriberid
+    run keyword if    "${type}"=="FQDN"    click element    id=sidebarObjects_fqdn
+    run keyword if    "${type}"=="IP"    click element    id=sidebarObjects_ip
 object-edit-HTTPSignature
     [Arguments]    ${name}    ${reqrestype}    ${reqresheader}    ${keywordtext}    ${hex}=close
     Sleep    2
@@ -475,7 +493,7 @@ object-edit-HTTPSignature
     Sleep    2
     Create-name    ${name}
     Sleep    1
-    click element    id=objectAddEdit
+    click element    id=editForm0
     Sleep    1
     Create-ReqRes-type    ${reqrestype}
     Create-ReqRes-header    ${reqrestype}    ${reqresheader}
@@ -531,58 +549,58 @@ Cerate-Group
 
     run keyword if    "${objectform}"=="IP" and "${groupadd}"!="open"    run keywords    Select-ip_type    ${ip_type}
     ...    AND    sleep    1
-    ...    AND    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[4]/div/div/div[2]
+    ...    AND    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[4]/div/div/div[2]
     ...    AND    Create-Sub-Objects       ${object_name}
     run keyword if    "${objectform}"=="IP" and "${groupadd}"=="open"    run keywords    Select-ip_type    ${ip_type}
     ...    AND    sleep    1
-    ...    AND    click element    xpath=//*[@id="objectAddSubAdd"]
+    ...    AND    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[4]/div/div/div[2]
     ...    AND    Create-Sub-Objects-groupadd     ${buildType}    ${groupaddType}   ${name}    ${objectform}     ${groupadd}    ${object_name}    ${objectform}    ${ip_type}      ${ipclienttext1}     ${keywordtext}    ${hex}    ${reqrestype}    ${reqresheader}        ${post}    ${Country}    ${City}
-    run keyword if    "${objectform}"=="HTTPSignature" and "${groupadd}"!="open"    run keywords    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[3]/div/div/div[2]
+    run keyword if    "${objectform}"=="HTTPSignature" and "${groupadd}"!="open"    run keywords    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div/div[2]
     ...    AND    sleep    1
     ...    AND    Create-Sub-Objects    ${object_name}
-    run keyword if    "${objectform}"=="HTTPSignature" and "${groupadd}"=="open"    run keywords    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[3]/div/div/div[2]
+    run keyword if    "${objectform}"=="HTTPSignature" and "${groupadd}"=="open"    run keywords    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div/div[2]
     ...    AND    sleep    1
     ...    AND    Create-Sub-Objects-groupadd     ${buildType}    ${groupaddType}   ${name}    ${objectform}     ${groupadd}    ${object_name}    ${objectform}    ${ip_type}      ${ipclienttext1}     ${keywordtext}    ${hex}    ${reqrestype}    ${reqresheader}        ${post}    ${Country}    ${City}
     ...    AND    sleep    1
-    run keyword if    "${objectform}"=="FQDN" and "${groupadd}"=="open"    run keywords    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[3]/div/div/div[2]
+    run keyword if    "${objectform}"=="FQDN" and "${groupadd}"=="open"    run keywords    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div/div[2]
     ...    AND    sleep    1
     ...    AND    Create-Sub-Objects-groupadd     ${buildType}    ${groupaddType}   ${name}    ${objectform}     ${groupadd}    ${object_name}    ${objectform}    ${ip_type}      ${ipclienttext1}     ${keywordtext}    ${hex}    ${reqrestype}    ${reqresheader}        ${post}    ${Country}    ${City}
     ...    AND    sleep    1
-    run keyword if    "${objectform}"=="FQDN" and "${groupadd}"!="open"    run keywords    click element     xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[3]/div/div/div[2]
+    run keyword if    "${objectform}"=="FQDN" and "${groupadd}"!="open"    run keywords    click element     xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div/div[2]
     ...    AND    sleep    1
     ...    AND    Create-Sub-Objects    ${object_name}
-    run keyword if    "${objectform}"=="SubscriberID" and "${groupadd}"!="open"    run keywords    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[3]/div/div/div[2]
+    run keyword if    "${objectform}"=="SubscriberID" and "${groupadd}"!="open"    run keywords    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div/div[2]
     ...    AND    sleep    1
     ...    AND    Create-Sub-Objects    ${object_name}
-    run keyword if    "${objectform}"=="SubscriberID" and "${groupadd}"=="open"    run keywords    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[3]/div/div/div[2]
+    run keyword if    "${objectform}"=="SubscriberID" and "${groupadd}"=="open"    run keywords    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div/div[2]
     ...    AND    sleep    1
     ...    AND    Create-Sub-Objects-groupadd     ${buildType}    ${groupaddType}   ${name}    ${objectform}     ${groupadd}    ${object_name}    ${objectform}    ${ip_type}      ${ipclienttext1}     ${keywordtext}    ${hex}    ${reqrestype}    ${reqresheader}        ${post}    ${Country}    ${City}
     ...    AND    sleep    1
-    run keyword if    "${objectform}"=="Key" and "${groupadd}"!="open"    run keywords    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[3]/div/div/div[2]
+    run keyword if    "${objectform}"=="Key" and "${groupadd}"!="open"    run keywords    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div/div[2]
     ...    AND    sleep    1
     ...    AND    Create-Sub-Objects    ${object_name}
-    run keyword if    "${objectform}"=="Key" and "${groupadd}"=="open"    run keywords    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[3]/div/div/div[2]
+    run keyword if    "${objectform}"=="Key" and "${groupadd}"=="open"    run keywords    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div/div[2]
     ...    AND    sleep    1
     ...    AND    Create-Sub-Objects-groupadd     ${buildType}    ${groupaddType}   ${name}    ${objectform}     ${groupadd}    ${object_name}    ${objectform}    ${ip_type}      ${ipclienttext1}     ${keywordtext}    ${hex}    ${reqrestype}    ${reqresheader}        ${post}    ${Country}    ${City}
     ...    AND    sleep    1
-    run keyword if    "${objectform}"=="URL" and "${groupadd}"!="open"    run keywords    click element   xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[3]/div/div/div[2]
+    run keyword if    "${objectform}"=="URL" and "${groupadd}"!="open"    run keywords    click element   xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div/div[2]
     ...    AND    sleep    1
     ...    AND    Create-Sub-Objects    ${object_name}
-    run keyword if    "${objectform}"=="URL" and "${groupadd}"=="open"    run keywords    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[3]/div/div/div[2]
+    run keyword if    "${objectform}"=="URL" and "${groupadd}"=="open"    run keywords    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div/div[2]
     ...    AND    sleep    1
     ...    AND    Create-Sub-Objects-groupadd     ${buildType}    ${groupaddType}   ${name}    ${objectform}     ${groupadd}    ${object_name}    ${objectform}    ${ip_type}      ${ipclienttext1}     ${keywordtext}    ${hex}    ${reqrestype}    ${reqresheader}        ${post}    ${Country}    ${City}
     ...    AND    sleep    1
-    run keyword if    "${objectform}"=="Category" and "${groupadd}"!="open"    run keywords    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[3]/div/div/div[2]
+    run keyword if    "${objectform}"=="Category" and "${groupadd}"!="open"    run keywords    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div/div[2]
     ...    AND    sleep    1
     ...    AND    Create-Sub-Objects    ${object_name}
-    run keyword if    "${objectform}"=="Category" and "${groupadd}"=="open"    run keywords    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[3]/div/div/div[2]
+    run keyword if    "${objectform}"=="Category" and "${groupadd}"=="open"    run keywords    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div/div[2]
     ...    AND    sleep    1
     ...    AND    Create-Sub-Objects-groupadd     ${buildType}    ${groupaddType}   ${name}    ${objectform}     ${groupadd}    ${object_name}    ${objectform}    ${ip_type}      ${ipclienttext1}     ${keywordtext}    ${hex}    ${reqrestype}    ${reqresheader}        ${post}    ${Country}    ${City}
     ...    AND    sleep    1
-    run keyword if    "${objectform}"=="Account" and "${groupadd}"!="open"    run keywords    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[3]/div/div/div[2]
+    run keyword if    "${objectform}"=="Account" and "${groupadd}"!="open"    run keywords    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div/div[2]    
     ...    AND    sleep    1
     ...    AND    Create-Sub-Objects    ${object_name}
-    run keyword if    "${objectform}"=="Account" and "${groupadd}"=="open"    run keywords    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[3]/div/div/div[2]
+    run keyword if    "${objectform}"=="Account" and "${groupadd}"=="open"    run keywords    click element    xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div/div[2]
     ...    AND    sleep    1
     ...    AND    Create-Sub-Objects-groupadd     ${buildType}    ${groupaddType}   ${name}    ${objectform}     ${groupadd}    ${object_name}    ${objectform}    ${ip_type}      ${ipclienttext1}     ${keywordtext}    ${hex}    ${reqrestype}    ${reqresheader}        ${post}    ${Country}    ${City}
     ...    AND    sleep    1