made parameter components optional, and if specified, they are mapped to
the '__NO_COMPONENT__' dictionary key. Also removed parameter as tag
code as it no longer works with my changes (can be reinstated if
required)