Match page works with new DB schema now