Fixed up filters, toggle select