WKS-243: Added id search around quotes to make sure the complete id matches