Fixed DataSelect + DataService, missign search enhancements