find* methods slightly changed