- made fragment
- added cursor query for better performance