added query option