Fixed some bugfixes in finder methods.