Fix for query param