Fixed issue where empty filters would result in eval failures, and added more tests