Added settings, fixed filters