Fixing Shorthandle Database