Fixed charts and fixed Velocity2JS to handle maps