Domain index name fix
Rules support device id