Fixes in the databases UI after merge