Added db source
Fixed bug with invalid selection listener