correct filter by column
update to new directory layout