Added a missing !empty check
Added the option to return the field name
Added the option to return the field name