Fixed Filter Settings to be more compact and accurate.