Add fix for "No Application Found Unable to find a matching application for request"

Add fix for "No Application Found Unable to find a matching application for request"