sidebar search complete
Merge pull request #14 from daven009/master

Updates
Merge pull request #15 from daven009/master

Updates
move map init to common helper and function
solve conflict
fix map bug
Fix