Fixed issues with redirect/refresh of forms