Fixed map view and added primitive dataset search functionality