[3.0] change adding focus indicator logic