*8637* Fix non existing class import and moved filter template file