[fix] table view and map view fixes