Improved entry type matching
Added a workaround for title matching