XPATH: Updated the engine in order to handle missing optional attributes
bestter.