Bugfixes, 100% test coverage, OR statements for separate .filter arguments