Added more filtering for colorized output