added when/where cols
added map component