Few changes in one_to_many_explorer