fix barrel query