Gd : removing unwanted design - equipment and property, added the query string to be agent,