Improved multiple query options handling