added filters, fixes