client & admin query lists + fixes