virt_db refactor code WRT target select