Changed to using line numbers as tags