Get all queries to include from persistent store as well

Also sets query name as subject in email notification
Pushed fix