Small code improvements in QueryInterceptor
ISPN-3054 Add ability to customize the creation of Work instances in QueryInterceptor