Add more constraints into the new match form