TMP commit to load the log file content.
TMP4: Final set of changes
Add null-check and missing HQL query