minor fixes and add BaseEngineFilter