DC1 fix for better RUN tab performance