Issue #21.

Partial fix for Issue #21. Search by content now added.