API search fixes
Merge pull request #90 from spawluk-bitbar/devel

API search fixes