Improve filters and forms for settings