Add additional query tools and preserve query on navigation via local storage