fix include/exclude item type queries