Also, I changed some % to %%. Although this wasn't a problem in practice, using a single % means relying on internal behavior of db_query.

* Reduce the number of variables used by the location map block.