Added filters for tables