[AW-1260] adding focus and active