Aegis Quote Load

Corrections to the logic when the quote is loaded.