Fix itemContext and itemFilter context