Tighten up security, searching improvements