Improve SQL query, Add new options for osmmap popup