remove dup label query
cleanup
move fetching to collection