Change broadcast queries to executing in a loop for better error messages