Addresses results toolbar duplicate links

Starts to address #348 but there are some outstanding issues and will meet with @jvine next week.