fix urls and add query set manager #25