Make remote search events driven + a few tidies