i05t05: Database manager (Lionfish) enhancement

The bugs mentioned in the pull request have been fixed.
The performance have increased.