Improve filtering workflow in Edit fields and null handling in DB adapter