Small changes to improve functionality DesktopDatabase