Fix silliness
Merge pull request #2268 from ghost1227/release/2.0

Add search by ID and token