Add list per prefix to fix productions topology snapshots (#3369)

Add list per prefix to fix productions topology snapshots (#3369) #1324