Few fixes.

* Removed hardcodes entries
* left-stripped "$" from virtual services