Bug fixes, missing query strings fixed.