Just don't watch till the filler is done. I have high hopes for the manga storyline.