be more strict about matching tagged lines