#36 refactor collection listing utils
#36 refactor collection listing utils