get rid of unnecessary template. add workaround to search for of and for.