Starting to put the filters for templates back in
Added hasReturnType and isDoublePointer filter back in
Added more filters for combine templates back in