added conditional logic to some et-query code, also commented that same code for testing
Merge branch 'test3' of https://github.com/DRI-Dev/dricode into test3