Changes to solve #1081 filters not working for features with a space in ...

...the identifier