Fixing pagination issue
Fixing tag scanning issue