Add full filter functionality