Added current user helper and fixed display of results