Added filtering by table