Fixed #22 #28. Support CPT & more filters