(cleanup) move shouldPrepare func to being a Query type method