Fix filter issues while adding table