Complete simple search

Ready to merge.