Small Fixes

Database and Table-Link-Generator