Match create form improvement