Better control for search results

Should resolve #94