Query timeout from configuration
Fixed execution of update statements
Minor fix
Error handling