Add region filter + Fix data persistence in a multi-step form