- fixed and refactored All Inject and View tags