VsProjectAssembly component searching improvements and refactoring
* Support for variables was missing