Modified patch for formating, also adding support for sqlite db name parameters.  Also fix potential db issues in sqlite if using multiple profile.