Filter bug solved. Thanks to l33tname for this note!111!!
Merge remote-tracking branch 'upstream/master'

Conflicts:
	filter.php
synced filter.php