Changed Trade flow options in both queries