Corrected selection and loading of a single Match

Change-Id: I51d80b2601c76f03bb8ba4516d211d8afb50df66