Improved ServiceLocatorStrategy for resultset