fix query_macro.hh comment
fix PartialRangePolicy and NarrowedRangePolicy