Have search use search_raw and count use search

Let's clean up this stuff.
Note this also allows passing keyword arguments for search_raw to search and count.
Good point, thanks. Done.