Add required annotations to stop empty entries

Also add the function that triggers of error texts being added to the
DOM to replace underscores with spaces.