Matching working

See "Migrated to SURF" in databaseConstruction