Make column highlighting more generic