cleanup and closes #3497, #3444
closes #3446
fix up testing environment
closes #3511 and tweaks search display