Get search working properly with angular

Also addresses #91