Expand search languages

Branch off #99 
Fixes #88