FLUID-5131: fix up after merge

Restored some lost code after the merge, also renamed uiOptions to prefs in the new code.