make queries more extendable