Support more complex partial element matches
1.5.1