[BUGFIX] Resolved issue with site module [TASK] Code clean-up and review [RELEASE] Minor bug fixing version release v11.4.4
