Moved query string params to a table rather than two additional huge sections