Fixed it so its no longer broken,  still trying to implement tag truncating as well