More edits to db selection