Added filtering by form type