Minor: debug cleanup
Reallow empty filter search
Sort incoming annotations