Added filters and support for more tables

Added pregmatch filters and support for more table values.