Jacalvo/find multiple fields

Based on rduran/find-multiple-fields-3.0