minor simplifications, corrected wrong iterator incrementation in filter