Changes to the Query system to better process new and old ItemStacks