[master] changed inner join to left join & added handling for empty
values when fetching them for display on the table