Fix FP552504 - Issue with module view pages