Bug#7: 404 handling improved + calc markup fixed