Added todo logs for queue sonar findings.