Resolved Issue #91

Also fixes an unlikely case where, in the previous logic, if a prop wasn't in its container in the loop that the search would stop for the entire row.