Fixed issue with match field not being used correctly in overlays

Main code rev. 1977