Unupgrade, unpolish added. Also fixed filter:both bugs