fixed bool mapping and return undef on entry not found