Fixed most bugs with finding indicators