[FEATURE] Results in map or list view
[MERGE] Resolve Conflicts