- minor changes in query representation