Add inverted logic for "query" option