Moved query param stuff out from settings file