made filter & directive universal