Improved free loops searching and labeling