added item_type to queries per issue #157
merge conflicts