Fix sort review form issue #1511