Minor Bugfix: Double system query options result in server error