Main filter fixed
Completer fixed