Just because I had to hunt, cross reference, order, find out I ordered the wrong one, etc, here is most of the filters for a 804B with Yanmar in it that will definitely fit.
Air filter-Napa Gold Auto Filter (2489)
Oil filter-Carquest 85334,Komatsu YM129150-35153, Yanmar 129150-35152 all work...