Fixed front-end highlight and error