Add FilterName and FilterGeneric functions so the filters know the correct context of what is being filtered Update name filtering to use FilterName, apply FilterGeneric to vending machine names