subscribe locale, flow bugs fix