Moved @filter.call into iterate

Change-Id: Ic74d50fbdea8c17852f6aec2cd0ab608dc913d1d