Typofix and adding comment to improve speed of filtering.