Reduce DOM queries for Search elements
Refactor connection logic

Aiming to be flatter, with less deep nesting. Still more to go here.
Improve readability of a selector