Reorganized the fragment and query string removal sections