A few SearchRequest fixes
Add tests