Improved match retrieval