1)Payment Methods now can be searched using the new search api, 2) corrections done as per previous pull request recommendations