Boolean support adjustment (Query / Edition)