GTNPORTAL-2852 Improve resource bundle service