Fixed searchfunction and matchmaking