Add anchor links and error message