Remove geozones stuff
Rename some variables for consistence
Remove main action in search controllers, rework search action a bit