Rework code to ommit unnecessary filter call.