Bug fix: grid always highlighted