Use the proper filtering function