/query improved, documentation added