Fix query is required for Zimbra 7.x