DatabaseWidget manual patch