Personally, I would (and have) move over to Freescan: ScanNow.org - The Home of FreeSCAN!
It handles all the new functions for the new FW revs and allows UASD databases to be imported and modified very easily. and it is much more user friendly in general. You can also have ONE database for 396 and 996. It seperates the sites into seperate systems when you send a 996t file to a 396t. And you can import from Radio Reference if you have a paid account with them.