Fix NPE clicking empty slot, fix multiple 'Current location'