improved selection
added getter for datacontext