improved frontend and match selection