added map handling in listing list