Adding complete filter functionality