Fix findby interface