restored functionality to court-filter input, cleaned up in the process