Fix zooming
Add error handling for empty results