added: query by polygon, query by box rewrited