subservice quickzap fixes