Bugfixes in find(), findFirst() function