fix timing issues and possible query failures
fix timing issues and possible query failures

Bairdo/faucet,gizmoguy/faucet,trentindav/faucet,trungdtbk/faucet,mwutzke/faucet,REANNZ/faucet,wackerly/faucet,Bairdo/faucet,isomer/faucet,trentindav/faucet,byllyfish/faucet,faucetsdn/faucet,wackerly/faucet,shivarammysore/faucet,faucetsdn/faucet,mwutzke/faucet,byllyfish/faucet,shivarammysore/faucet,gizmoguy/faucet,anarkiwi/faucet,REANNZ/faucet,isomer/faucet,anarkiwi/faucet,trungdtbk/faucet