Layout performance improvement, qpf update