Query build and error

totally agree with this removal.