* Removed redundant resource id passing
* Fixed setting resource id in parser in case of pipelines