added ScrollMap flag into flow logic