fix-up claim search, add emma's street/satellite controls