Search works but a bit wacky