Fix issue #447
Enable reusing query option objects in find
Fix bad formatting of code
Merge pull request #450 from ricardograca/master

Fix issue #447