Refs EQ-106 Fixed url encoding
Code improvement