renamed patch to service and added code to handle qualifier