Update accepted query string types
UUID cleanup