Added backward compatibility for new filter arguments and option names.