Search fix

Fixing issue #8