Account for site_id so manual override of queue for spray preview send
Switch to test-override address
Tidy up code