Bug 863312 - Add support for finding one make by any passed field