Better handling of query params on initial load.