Reduce server requests by eof and bof alignment (+ tests)