Moved @filter.call back

Change-Id: I77f020539bc8e921f1e67b9700fc47b0aeb5df81