Added 'Return' button and keeping the query string for list view and form view