Fixed initial database selection