Fix extra column
Implement switching between fuzzy and substring