SR# 7248
Added three locations to all the quries and updated the SQL Agent on the Steps for the nightly job