Made some changes; removed the old encoders.
Spec for queries.