Fix filter
Fix table and column names.