Fix for filtered items and dummy items