Working over page overflow/filling optimization [intermediate commit]