Fixed listeners to work with custody. Broken due to scoreboard and SQL changes