#196 Fixed markup and variables on time pass form