New version

Add filters for the column values
Add the class table only if needed