Feature/search revival

This should fix #88.