Escape the selector ids while constructing

Change-Id: I776a3d85478356fad8291c86bc9cb3097f883a32