More dbtool -> selector updates