Fixed empty search issue.

Closes #8.
Tweaks and not found in new area.

Closes #2.