[#861816] Fixed small rebase issue, some error handling, and search limit changed from default of 10 to 100.