Merge pull request #540 from slovensko-digital/fix/enable_choosing_fs…

Merge pull request #540 from slovensko-digital/fix/enable_choosing_fs… #2535