Fixed remaining issues with django filter migration
Fixed remaining issues with django filter migration

emergence-lab/emergence-lab,wbg-optronix-lab/emergence-lab,wbg-optronix-lab/emergence-lab,wbg-optronix-lab/emergence-lab,emergence-lab/emergence-lab,emergence-lab/emergence-lab