Final hacks added before demo - Search added!