I'm closing this issue and send a patch series to update the whole page 
instead.