adding all
using latest uri form
overhauling uri to include query as well as page