1 files changed, 3 insertions, 3 deletions
diff --git a/sql/serenitasdb.sql b/sql/serenitasdb.sql
index 7e84028d..5e67fe84 100644
--- a/sql/serenitasdb.sql
+++ b/sql/serenitasdb.sql
@@ -730,7 +730,7 @@ $$
        FOR r in EXECUTE
 	 'SELECT quotesource, quoteset FROM tranche_quotes_ref
 	 WHERE index=$1::index_type AND series=$2 AND date(timezone(''localtime'', quotedate))=$3
-	 AND tenor =$4::tenor ORDER BY quotedate desc'
+	 AND tenor =$4::tenor AND deleted IS DISTINCT FROM true ORDER BY quotedate desc'
        USING pg_index_type, pg_series, pg_date, pg_tenor LOOP
        -- The JPM quotes are untriggered whereas Citi quotes are triggered
        IF pg_index_type = 'XO' AND pg_series = 22 AND
@@ -746,9 +746,9 @@ $$
        EXECUTE
           'SELECT array_agg(attach ORDER BY attach ASC)||100::smallint = $1||array_agg(detach ORDER BY detach ASC)
            FROM tranche_quotes_tranches
-           WHERE quoteset=$1 AND NOT deleted'
+           WHERE quoteset=$2 AND NOT deleted'
        INTO flag
-       USING r.quoteset, lower_attach;
+       USING lower_attach, r.quoteset;
        IF flag THEN
            best_quote := r;
        END IF;