The Onstartup loop wouldn't call break after the first success, thereby
sending the query multiple times and halting the process.

Some small other optimizations as well.
Signed-off-by: Miek Gieben <miek@miek.nl>