Store search fixed. Code cleanup.
Added calendar sync. Copy-paste for now.