fix conditional && fix filters && fix with && first partial call implement