fix sub request bugs