maps and carousel fixes