tighten up more queries