refactor stream on objects
better property escaping and existing check