- removed map (let used intent for Map)
- added intent filters
- remove tracking service (let use intent for it)