More code added to db selection on homescreen