#4791: Fix tabs on layout form so they filter correctly.
Merge pull request #4792 from openscholar/4791-layout_tabs_fix

Fix tabs on layout form so they filter correctly.