Refactor poi search
Revert fix for POI button config, because it causes troubles for waypoint dialog -checkbox
Merge branch 'master' of ssh://github.com/osmandapp/Osmand