PROJ-142: Corrected click event issues.
Merge branch 'develop' of github.com:Inovitex/fcms into develop