Updated HTML calls to FA v4