Refactoring

CellListenner and Map-search function
has a busg...