Fixed routing issues, report now generates correctly