increase strictness in queries operation as well
queries: use strict data type instead