speeding up queries, enhancing data view to include location, mac build fixes