fix missing properties; add tests
fix search limit logic