Fixed bug: Filter not working

Incorrect Parameter ordering. The filter now mostly works. However,
numbers are interpreted as strings and not correctly processed.
Fixed nullprotection