Improvement in the databse selector