Common filter issue fix