Fix ommision of entries in dumping, and bug in find_entry.

Signed-off-by: Raphael Catolino <raphael.catolino@gmail.com>