GIRAPH-560: Input filtering