Fixed filtering to allow more columns