Add filter on args preparing