Updated table filtering