(hack) Maps and address search integrated for new space