minor fix on and/or
Merge branch 'adios-query' of https://github.com/ornladios/ADIOS into adios-query
reorganize code