Clean up match query
Stub the frontend