Adding the ability to do a custom query string