making queries more stable