Fix for searching fields. Closes #107

This is a fix for both issues in #107.

Cheers,
Andreas