Removed all use of 'query', as it is a query prior to R16