fixed a merge bug on Views.py about searchexp
fixed bug in map.html