add filtering with all of fields if not added