Compatibility Fixes & adding missing query string parameters