Fix for SERVICE queries (#176)