added query_s variable