Fix issues that prevented forms from being sorted prior to a refresh. [refs #4541 and spent 1 hour on #4541]