Fix where statements so Streams returns from what's searched for