OOIION-1819: Fix facepage issues