Fixed issue where couldnt use null in query string