Added location stuff to place search
Cleaned up stuff